Jonathan Basseri 9a19e8948d resolve merge conflicts of 4c04097 to nyc-mr1-dev ...

am: 04c35e78db

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

Change-Id: Ie26627bb443603f1e5f017a8df243922d2955f3d

2016-05-26 23:13:17 +00:00

..

android/telephony

resolve merge conflicts of 4c04097 to nyc-mr1-dev

2016-05-26 23:13:17 +00:00

com/android

Merge "Add restricted card state to telephony manager." into nyc-mr1-dev

2016-05-25 21:39:12 +00:00