summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Philip Junker <philipjunker@google.com> 2023-07-25 13:48:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-25 13:48:00 +0000
commit173118a7204fb3e57730bc04f80c234be6df888e (patch)
tree5ddd9efff285860bcf633d742246035020f0fbdc /libs/androidfw/ObbFile.cpp
parent67622b2d11ec4fa52e74602a6fc0e6b31d724dfe (diff)
parent5fa79c2e30926f9ce552d5b541f4d624b04026d9 (diff)
[automerger skipped] Merge "Disable screen wake locks for cached apps" into udc-dev am: c339d55d32 am: 5fa79c2e30 -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: I37087de471a084e35158a2c56f191050089e6cbc 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