Xiangyu/Malcolm Chen 3748d15321 Merge "Added network service interface" am: 71793be6bb ...

am: 2b06789511

Change-Id: I88aeed6b03d39e7555ad9de62b954eac62da3f79

2018-01-24 20:55:01 +00:00

..

android/telephony

Merge "Added network service interface" am: 71793be6bb

2018-01-24 20:55:01 +00:00

com/android

Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""

2018-01-24 10:44:10 +00:00