tree 1ae3d99686cabf6259aaadac9b4dbf01b87f4f56
parent 8e3dcbb5d3a032836e0004c99938c552ab3737dd
parent 8fd5b7e1c3efc51b10911be3a1f1cc98e8402556
author Holly Jiuyu Sun <jiuyu@google.com> 1516780128 +0000
committer android-build-merger <android-build-merger@google.com> 1516780128 +0000

Merge "Add getUiccSlots() and switchSlots() in TelephonyManager."
am: 8fd5b7e1c3

Change-Id: Ia822753db39db9b383e8e987049ec4a0738ac27b