Jonathan Basseri 531cd8724c Merge "Change how TelephonyManager handles subscriptions." into nyc-dev ...

am: 4c04097fdb

* commit '4c04097fdbe0fe414a6fcb2d6174e295986a3f66':
  Change how TelephonyManager handles subscriptions.

Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd

2016-05-26 16:12:55 +00:00

..

android/telephony

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

2016-05-26 16:12:55 +00:00

com/android

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

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