tree 4d5a8824634d45e50c4bf5f9f55f0395bbb03b81
parent 43a3671a422386759b5ecc2667e2ae85b4d35336
parent 596c22a84d46a646c4b1ab6163822cbaa01eb229
author Holly Jiuyu Sun <jiuyu@google.com> 1516836269 +0000
committer android-build-merger <android-build-merger@google.com> 1516836269 +0000

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

Change-Id: I6320f2195eeb2221fb29778b6171c3ebdb3f8dac