summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Peter Li <lpeter@google.com> 2024-08-29 03:54:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-29 03:54:02 +0000
commita1aad62777acd186205de2ba3e1373294b1c5085 (patch)
tree71ca72d9057c2ad62b41f539d91fb3d56c8ae20d /libs/androidfw/ObbFile.cpp
parent3029e2e7d890a20f4815306d5fc85e5032e49d32 (diff)
parenta0ad651751e0185c75610d580fdecf6f7fcd6d05 (diff)
[automerger skipped] Merge "Disallow device admin package and protected packages to be reinstalled as instant." into tm-dev am: 9454d5b14a am: fbb2b5b309 am: a9ec1af49d -s ours am: b333b0141f -s ours am: a0ad651751 -s ours
am skip reason: Merged-In I30244cf18aa6522361f13a1d2119ac5847939ddd with SHA-1 1e0d36fa43 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28719119 Change-Id: Icd7ccd158171b56aa661c0653e03bd68cf904442 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