summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Pavel Grafov <pgrafov@google.com> 2023-03-31 15:23:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-31 15:23:46 +0000
commite6871844eb61ddf6a3099277258a3cc0608b12ba (patch)
tree2ff0fc4af2327c577af1f0fa8c6a4b774a24292a /libs/androidfw/ObbFile.cpp
parentbb4092a3c5352ff9a147ef6ad0a7075ee4d980f5 (diff)
parenta95419098d24a74f3046174cbf9161ac5936ad55 (diff)
[automerger skipped] Merge "Enforce DevicePolicyManager.setUserControlDisabledPackages in AppStandbyController" into rvc-dev am: b4083e039e am: 0e7ecf6fbe -s ours am: a95419098d -s ours
am skip reason: Merged-In I4279dc37f0e17aedb1c2a87468478248443a253e with SHA-1 3dbab873d6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22301867 Change-Id: I08df5e5c15cd3e5a01fc68a7502031f596f7bc44 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