summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-06 21:55:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-06 21:55:58 +0000
commit60de120ce8b11f0cd7bf0aefe833f1636cbb54a4 (patch)
tree325e2e0e75ba389d23f87c6bb87f341214041145 /libs/androidfw/ObbFile.cpp
parent0ca11b09913eb8bd9c976944757c3ebccdd1a650 (diff)
parentfd04b7cd70413a25c12a581eddb9ea1f4f2a3bc6 (diff)
[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into sc-v2-dev am: 6431ce195d -s ours am: fd04b7cd70 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20334962 Change-Id: Ib130cf417813db11742678e054acac5209273be8 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