OSDN Git Service

Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bc...
authorJack He <siyuanh@google.com>
Mon, 10 Apr 2017 23:31:55 +0000 (23:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 10 Apr 2017 23:31:55 +0000 (23:31 +0000)
am: b111c6f753

Change-Id: Iee048785ebe566fcb8e80c5e97bb61a78b4afde2


Trivial merge