tree 519c03908ea919f929677dfc76bbe3f3f4ba0429
parent 101fca656d56896a9c53c12ca4c9c150444e111e
parent 65d806d0438f073f93403c48a571b4d66434a073
author Tyler Freeman <fuego@google.com> 1501551224 +0000
committer android-build-merger <android-build-merger@google.com> 1501551224 +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

Change-Id: Ie89e28aae64abfc833ed97748654d509cd52c07b