tree f521e81f08945526eefa22de4ebda1178b0d8408
parent c3ff7ad3876ea50ef4bcee04f0c1b4af6d81868b
parent d5669103077f45d4dd49eaa78031cb047f6e855a
author Jordan Liu <jminjie@google.com> 1550107635 -0800
committer android-build-merger <android-build-merger@google.com> 1550107635 -0800

[automerger skipped] Merge "Allow privileged apps to call getUiccCardsInfo" am: 35175b13b0 am: 55b6a78eea
am: d566910307 -s ours
am skip reason: change_id I86447b33162fb0cb3c66439ba664df2d8114e33d with SHA1 c65bc95b2b is in history

Change-Id: Ia80150994049fc42884ae0b5f5a7507cc1303117