summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-07 01:04:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-07 01:04:53 +0000
commit4cf9607110cf687e21e6c73aad27157d98345c69 (patch)
tree0d3ee1268af69456d969399ce4354d649572cdb9 /libs/androidfw/ObbFile.cpp
parentbdb055cd9a0ef047fe2215f791f2d4a9436f6567 (diff)
parent3f31bbe61b546aeb6b388ca51b9fa78797a82fa1 (diff)
[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into rvc-qpr-dev am: 3a9e1c2bc1 -s ours am: 82c20b69ce -s ours am: 7f16e54187 -s ours am: 9cdde1b1cc -s ours am: 5b1db02d86 -s ours am: ca1abefcae -s ours am: 3f31bbe61b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20335897 Change-Id: I491ff69fa8692e978e148ce50563a4a97e6c9727 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