summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Philip Junker <philipjunker@google.com> 2023-07-25 14:52:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-25 14:52:47 +0000
commitf415dd3e279758da0b6fce796694873228c66c51 (patch)
tree26c7ffe7d807211e8ebe073bd600a6d422a439e4 /libs/androidfw/ObbFile.cpp
parent7f0bf14c190e57fb1049092bc89103313b402cfd (diff)
parentdc17b1a8e929dd5407ed2057e71f799e66aca0b0 (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: dc17b1a8e9 -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: Id59ca98e05263415cfe10ce70936a001cd5cc469 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