tree 44ec852c7f5d2dfa4a236eb1c2bceb0d17bd715e
parent 8da517347a43839d54df65b52ee24cb3729dd6cb
parent 95453eb3d17e1665bc263f9b07c228632f3b252e
author Jordan Liu <jminjie@google.com> 1548805375 -0800
committer android-build-merger <android-build-merger@google.com> 1548805375 -0800

Merge "getUiccCardsInfo does thorough permission checking" am: 3f0a25ed1a am: 69fa824d13
am: 95453eb3d1

Change-Id: Icbd252ef4a39cb00594d14701064ffb8c1d4cb61