tree 126ca1eb2e416e071ac4458d7a78efeb9d3ed5b2
parent 9afe59bf1c51eff020d58cf84e0b54895f231ad8
parent c14a4be7998b18ce7caea2b63ef30ca09868d1f7
author Malcolm Chen <refuhoo@google.com> 1533163261 -0700
committer android-build-merger <android-build-merger@google.com> 1533163261 -0700

[automerger skipped] Merge "Have proper permission check in getConfigForSubId"
am: c14a4be799  -s ours

Change-Id: I3bc606975e0ced7353e9bb174da95f4edcefdb1f