OSDN Git Service

resolve merge conflicts of 4c04097 to nyc-mr1-dev
authorJonathan Basseri <misterikkit@google.com>
Thu, 26 May 2016 23:13:17 +0000 (23:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 23:13:17 +0000 (23:13 +0000)
commit9a19e8948d7a716bf9ad6743ad85cbc4e2a5942d
tree7c9399e00428d8ebfb99317df80bb274c42a892d
parent09c511f039d9197da6a0fabdfadae47a10bbbeb1
parent04c35e78dbd5bc6670b5bf4e72686f696745af13
resolve merge conflicts of 4c04097 to nyc-mr1-dev
am: 04c35e78db

* commit '04c35e78dbd5bc6670b5bf4e72686f696745af13':
  Change how TelephonyManager handles subscriptions.

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