summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-06 23:16:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-06 23:16:55 +0000
commit631b06c346a27fcd49cc7c8524cd68bc732d29f6 (patch)
treec5af6e2ce54e06e904c6ce6cc6550a43dca6c185 /libs/androidfw/AssetsProvider.cpp
parentc6ace5b8a07e72ca5aeac731f81732478ac6ba92 (diff)
parent514ce87f59f2045ebc01d715f8bcf0f1630b6edf (diff)
[automerger skipped] DO NOT MERGE Grant carrier privileges if package has carrier config access. am: 63e2afe39c -s ours am: 94968d40e9 -s ours am: f26e98f2e2 -s ours am: ec542d6031 -s ours am: 514ce87f59 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23496742 Change-Id: I846cdec26dda4fdb3a2eb6498688f3646b0eebb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions