OSDN Git Service

Merge changes from topics "bt-hfp-add-set-active-device-method", "bt-system-api-annot...
authorJack He <siyuanh@google.com>
Mon, 8 Jan 2018 22:21:43 +0000 (22:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Jan 2018 22:21:43 +0000 (22:21 +0000)
am: b1ebd51c01  -s ours

Change-Id: I443bd449131bc242527229b3b238632d7ed1a8b7


Trivial merge