summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-07 01:06:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-07 01:06:19 +0000
commit033e4383a42c48b6f8b5676efac8903a452261ae (patch)
tree6ac3dd1f0ac53dbc2b3ca97f1f26412d38df4a3b /libs/androidfw/ObbFile.cpp
parent43222575d89bb5748ab1d5fe2f69e1ec6efa2872 (diff)
parente80f0e622b92356b95ca608efabf6643afd256dd (diff)
[automerger skipped] DO NOT MERGE Grant carrier privileges if package has carrier config access. am: e46bce078f am: a23179b825 -s ours am: 78f44f1815 -s ours am: 79e6e2f2bc -s ours am: 57eeee2a65 -s ours am: 49fa7075a4 -s ours am: e82c13a915 -s ours am: de4c4a433b -s ours am: e80f0e622b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20342565 Change-Id: I2e2a549769083eb016a56952ad0fe606afe46623 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