summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Philip Junker <philipjunker@google.com> 2023-07-25 14:11:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-25 14:11:44 +0000
commit08b59910e7d359e675ed567fa28fedc86e1df071 (patch)
tree3ebf17b8c6765ec252bf0e59a40894f4da658d1b /libs/androidfw/ObbFile.cpp
parent746068185348e760921ccb983ec1ee45b21ad45e (diff)
parent173118a7204fb3e57730bc04f80c234be6df888e (diff)
[automerger skipped] Merge "Disable screen wake locks for cached apps" into udc-dev am: c339d55d32 am: 5fa79c2e30 -s ours am: 173118a720 -s ours
am skip reason: Merged-In I1cf38ada2456c1cc1f367fad58ce95948d1b3a81 with SHA-1 4138a2e2e6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24107346 Change-Id: I00263eb21c51f92f0c6c567ebae4739df560d367 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