OSDN Git Service

Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
authorJonathan Basseri <misterikkit@google.com>
Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 16:12:55 +0000 (16:12 +0000)
commit531cd8724cad56e2a141dbe5acbe283372c21de4
tree260581206f871a8fee4798ba0127bab5d332e0d8
parente6c6ca417da6f62de4bdebd7b380f12b751a08b7
parent4c04097fdbe0fe414a6fcb2d6174e295986a3f66
Merge "Change how TelephonyManager handles subscriptions." into nyc-dev
am: 4c04097fdb

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

Change-Id: I5d63caf41cb55d3077f9a3c00f4f1cce6bbe5ddd
api/current.txt
api/system-current.txt
api/test-current.txt
telephony/java/android/telephony/TelephonyManager.java