OSDN Git Service

Merge "Add developer setting and system API for inband ringing support" into oc-dev
authorJack He <siyuanh@google.com>
Thu, 13 Apr 2017 20:07:44 +0000 (20:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 20:07:44 +0000 (20:07 +0000)
commit97164fe986de65bc283311efca81dabcee79a2e8
treebed23433aaade20d680dcad376cac4165f50abab
parent0bb486bcb48e10801e7d250e25214ef1a7ef1a6e
parentaadf525e1a1988b5c083f94f6aa00881e4a86c3d
Merge "Add developer setting and system API for inband ringing support" into oc-dev
am: aadf525e1a

Change-Id: I458b5df924ca65edc4b38ee1e275b6b6f86310fe