summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-06 22:37:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-06 22:37:55 +0000
commit5d324112d3faae4b2abe3cddd0939674fb53c515 (patch)
tree71aaa4d2e75ac3c8060a63ee5b7315c028bad637 /libs/androidfw/ObbFile.cpp
parent514ce87f59f2045ebc01d715f8bcf0f1630b6edf (diff)
parenta13645340e243c400ebf93480bbee85916c49f52 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23496742 Change-Id: Ib82ae5d059edf72df17392784f346f9e8646a013 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions