Jonathan Basseri 4c04097fdb Merge "Change how TelephonyManager handles subscriptions." into nyc-dev

2016-05-26 15:50:05 +00:00

..

android/telephony

Merge "Change how TelephonyManager handles subscriptions." into nyc-dev

2016-05-26 15:50:05 +00:00

com/android

Merge "OMADM intent sent by both system and apps." into nyc-dev

2016-05-17 17:41:11 +00:00