OSDN Git Service

Merge "Bluetooth: Remove strings for enabling inband ringing" am: 02a0397643 am:...
authorJack He <siyuanh@google.com>
Mon, 8 Jan 2018 20:34:04 +0000 (20:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Jan 2018 20:34:04 +0000 (20:34 +0000)
am: 8637bb7e46  -s ours

Change-Id: I8cf5acfb36a041a62b6be1b5af6ef77c9bc3e036


Trivial merge