summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-06 22:38:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-06 22:38:30 +0000
commitacbedb0998b416d99809b2a82a4a263dc80fb3b9 (patch)
tree71aaa4d2e75ac3c8060a63ee5b7315c028bad637 /libs/androidfw/ObbFile.cpp
parentfcc70937d42dfe21208eb41c55fa73e401e9d81c (diff)
parent11289d4cef90c8dfd949a4179a0b5fefb088370c (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: ab34cf4e8e -s ours am: 11289d4cef -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20341111 Change-Id: Ic286c221b954c88f1057823501c375e6335b8a97 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