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:53:40 +0000 (01:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 01:53:40 +0000 (01:53 +0000)
am: 1831989a6e  -s ours

Change-Id: I73c6844270e95d54307335418f4bfd2a0098aade


Trivial merge