tree f18b68162f0afb75b38a13be0a63c753af2643d8
parent 69fa824d13dd794492015d6478bb7b6a7905f65c
parent 3959bb0096df84478e73c002f6d5fe4c6533319c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1548803691 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1548803691 +0000

Merge "Merge "getUiccCardsInfo does thorough permission checking" am: 3f0a25ed1a" into stage-aosp-master