summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-06 23:17:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-06 23:17:24 +0000
commitd7c9feec9a3739d4d73b06051a5e5e12b617c808 (patch)
treec5af6e2ce54e06e904c6ce6cc6550a43dca6c185 /libs/androidfw/AssetsProvider.cpp
parent631b06c346a27fcd49cc7c8524cd68bc732d29f6 (diff)
parent5d324112d3faae4b2abe3cddd0939674fb53c515 (diff)
[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into sc-qpr1-dev am: 4b1014894b -s ours am: e77667f97d -s ours am: d56efecd08 -s ours am: a13645340e -s ours am: 5d324112d3 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23496742 Change-Id: I32da4635a230400fcc3a5825bed0a45d72532088 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