tree 46d78461f0adfa1f145bbaf20a1aee68c257571d
parent 606b0aa825df0cf90b04a0f47f7247c0f960cda6
parent 4989b7993ba5f79bdae9322f36ba6a46d05db346
author Petri Gynther <pgynther@google.com> 1464831972 -0700
committer Petri Gynther <pgynther@google.com> 1464832105 -0700

Merge BlueZ 5.40 to master

Merge BlueZ 5.40 from gfiber-internal/upstream to master.

Change-Id: Ib8ba5c60af9d7d37e025d696bff6f091f39b427e