tree 5555c1fc5ac60d40580e42e4e25d7707b27a3a5d
parent 3961ac394560123302c6a8d74e6b23b60e06c56c
parent 1831989a6e3ccf3610c53585d530383ea6debc7d
author Tyler Freeman <fuego@google.com> 1501552420 +0000
committer android-build-merger <android-build-merger@google.com> 1501552420 +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
am: 1831989a6e  -s ours

Change-Id: I73c6844270e95d54307335418f4bfd2a0098aade