summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-07 00:20:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-07 00:20:21 +0000
commit840c0d081d2dc5eabc53f930469b55c1acc420b7 (patch)
tree0e4be45a3f4cfe13629d7c85cd6bfa9367d5f9cb /libs/androidfw/ObbFile.cpp
parent6d2f6e405361f3e8111c27ad813b72f5b498f799 (diff)
parent4ea39d063c70d635e6ed970bd6336a26a10b729a (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20342565 Change-Id: I6943285cab15934bf4699d2dff6e6662eeee400c 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