summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-06 21:29:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-06 21:29:45 +0000
commitab34cf4e8ee2339f992e52523ca4d9905a85059b (patch)
tree9fa173d2828a67b6827593fc22215d0c0abfc56d /libs/androidfw/ObbFile.cpp
parent7ca4bbec6b306c11595ebf52557a7dde54409721 (diff)
parent368d47ce0e4d9bec0823af4ac968d1a34a41d780 (diff)
[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into sc-dev am: 87cd3bb999 am: 8df2f71a8d -s ours am: 368d47ce0e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20341111 Change-Id: I890fb7149f80bfc0050f962073b9ca3990482649 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