tree d12fca3cd6b98a0abc7a76ed44368a229684f59f
parent a600b3120148ee36ac165aaad2fd089ebdee6e43
parent 687a28d77d0272fcdd0124e54575a71c16eda726
author Holly Jiuyu Sun <jiuyu@google.com> 1516786962 +0000
committer android-build-merger <android-build-merger@google.com> 1516786962 +0000

Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fd5b7e1c3 am: 5598f5ab23
am: 687a28d77d

Change-Id: I56abcc7731ca08ed67a5123f826bfbc9ca4f74d0