OSDN Git Service

Merge "new carrier id APIs" am: 3d23b90874
authorChen Xu <fionaxu@google.com>
Wed, 17 Jan 2018 20:49:04 +0000 (20:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Jan 2018 20:49:04 +0000 (20:49 +0000)
commitea5e2ad900fdaca9937f74d78a8f2cb47f197a4b
tree10b9975c9d13ea5c40b89932ea64aba20dfcbff8
parent723d0f061ae4223951fc5edaaf188798479ae207
parent753730984391312b04f3840f1111622be6a96923
Merge "new carrier id APIs" am: 3d23b90874
am: 7537309843

Change-Id: I8b64968ddb59304543eee89eb1e2dcb4d66517e3
telephony/java/android/telephony/TelephonyManager.java