summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Philip Junker <philipjunker@google.com> 2023-07-25 14:11:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-25 14:11:14 +0000
commit746068185348e760921ccb983ec1ee45b21ad45e (patch)
tree3ebf17b8c6765ec252bf0e59a40894f4da658d1b /libs/androidfw/ObbFile.cpp
parentb62f60711e1bbe35d5d3afa43f4d770b9b70a286 (diff)
parent67622b2d11ec4fa52e74602a6fc0e6b31d724dfe (diff)
[automerger skipped] Merge "Disable screen wake locks for cached apps" into udc-dev am: c339d55d32 am: 70413a9624 am: 67622b2d11 -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: I7fba468e91ce31c6841a2ab16f2b957dcd4a5c3f 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