summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-07 01:05:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-07 01:05:53 +0000
commit43222575d89bb5748ab1d5fe2f69e1ec6efa2872 (patch)
tree6ac3dd1f0ac53dbc2b3ca97f1f26412d38df4a3b /libs/androidfw/ObbFile.cpp
parent85edd2d304db5c1e40adb98b19442e0ac7a32146 (diff)
parentb07f41ea0ed31af7752707c754e0d57afd0a79e9 (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: 15720500ec -s ours am: d0fa7c0b36 -s ours am: b07f41ea0e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20335897 Change-Id: I97412a6e7092b07669d89bc158f636dd31251e67 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