tree d95e8b50ac4710bcde73ec8fb6f9b67f945db93c
parent d2063214a5391c9bc2f1fe2071f2c402c6105e15
parent 6b2d37ca25122e3285ddc657258378b9e7d4960f
author Tyler Freeman <fuego@google.com> 1501551678 +0000
committer android-build-merger <android-build-merger@google.com> 1501551678 +0000

Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am: a053eaa841  -s ours am: 65d806d043  -s ours
am: 6b2d37ca25  -s ours

Change-Id: I111a86ba53a48ab3db3e5211e86afc0a1d2a21e0