OSDN Git Service

Merge "Carrier id api rename" into pi-dev
authorChen Xu <fionaxu@google.com>
Mon, 12 Mar 2018 22:49:21 +0000 (22:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 12 Mar 2018 22:49:21 +0000 (22:49 +0000)
1  2 
api/current.txt
telephony/java/android/telephony/TelephonyManager.java

diff --cc api/current.txt
Simple merge