Jordan Liu 7d18bfa67b Merge "Use SubscriptionId instead of SubId" into oc-dev am: 8079a69eba ...

am: 0ed1bf8e4d

Change-Id: Idf6ba180718f4f288534fee01df9fadc3b68755d

2017-04-20 18:24:50 +00:00

..

android/telephony

Merge "Use SubscriptionId instead of SubId" into oc-dev am: 8079a69eba

2017-04-20 18:24:50 +00:00

com/android

Merge "EUICC API changes to support error resolution."

2017-04-17 19:22:49 +00:00