OSDN Git Service

Merge "new SystemAPI to getSimLocale" am: 5cf41e47fe
authorPengquan Meng <mpq@google.com>
Tue, 29 Jan 2019 07:03:32 +0000 (23:03 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Jan 2019 07:03:32 +0000 (23:03 -0800)
commit59691cc266d498e71a2eaa9a929fe5556ea4afb1
tree40abd0f56cc9bef65e4c0f1c264d1b9fcfcfbc71
parentca7c41f5fa121c778f00b2c8696253affa7eaa00
parent1b607c875f8d9faa46889449d04dd23fce1f2b20
Merge "new SystemAPI to getSimLocale" am: 5cf41e47fe
am: 1b607c875f

Change-Id: I2a6c1b9aaab034763f261d7464bd302ad5bbdd2d
api/system-current.txt
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ITelephony.aidl