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