OSDN Git Service

Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled" am: 8244eb...
authorTa-wei Yen <twyen@google.com>
Wed, 13 Dec 2017 22:29:36 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Dec 2017 22:29:36 +0000 (22:29 +0000)
am: 3d89874bb5

Change-Id: I6b1882e006a7b708c5979b4970a2ddc9be35f93b

1  2 
api/current.txt
telephony/java/android/telephony/TelephonyManager.java

diff --cc api/current.txt
Simple merge