summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-07 01:05:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-07 01:05:23 +0000
commit482ce9b2ba323eb107a19c660577183205bcc256 (patch)
tree0d3ee1268af69456d969399ce4354d649572cdb9 /libs/androidfw/ObbFile.cpp
parent1f0ca120c96b82c6d00350aaa36606c89f8e1cf9 (diff)
parent840c0d081d2dc5eabc53f930469b55c1acc420b7 (diff)
[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into rvc-dev am: 432eb6d7eb am: ebe1be1bf0 -s ours am: 3b69f55309 -s ours am: 31b36202e0 -s ours am: f44f39cc62 -s ours am: c55ad46b12 -s ours am: 4ea39d063c -s ours am: 840c0d081d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20342565 Change-Id: Iac77f881876bc0786cb952b2aa2ba0e2333c1e62 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