OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
authorTyler Freeman <fuego@google.com>
Tue, 1 Aug 2017 01:44:16 +0000 (01:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 01:44:16 +0000 (01:44 +0000)
am: 6b2d37ca25  -s ours

Change-Id: I42768a60dd38d276cc013a66c5af9aecd06b755d


Trivial merge