tree 4948cffa706f611bd402344595ba356671077c4d
parent cb15919569ba9cec08e1c0f34fc6e1173700996a
parent 07b212b7881ae1b0d1adc7f098f5597ac6cc839b
author Holly Jiuyu Sun <jiuyu@google.com> 1516837036 +0000
committer android-build-merger <android-build-merger@google.com> 1516837036 +0000

Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402d2 am: 596c22a84d
am: 07b212b788

Change-Id: I771845c9f07aa18946c0ab99fffd2a08d888e819