OSDN Git Service

Merge "Add developer setting and system API for inband ringing support" into oc-dev...
authorJack He <siyuanh@google.com>
Fri, 14 Apr 2017 15:56:10 +0000 (15:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 15:56:10 +0000 (15:56 +0000)
am: 97164fe986

Change-Id: Iddc91ebca96bcb8e660c1b7117ab3fa57be7d4ee


Trivial merge