tree 036d0753b7233e13479db6348e874e08d8ae92c7
parent ae992b6392c10134fe250d32f0d7e85e21998e6f
parent b5928a2b810f82d907dadec57e3e69c18dd5d2d9
author Nicolas Geoffray <ngeoffray@google.com> 1516798936 +0000
committer android-build-merger <android-build-merger@google.com> 1516798936 +0000

Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am: 1f568c14ac am: b91d1b3e3a
am: b5928a2b81  -s ours

Change-Id: Ia781d4799c9b4df316a9617055f99dbdf3e51a30