summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Evan Rosky <erosky@google.com> 2023-06-08 16:59:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-08 16:59:04 +0000
commit3b526e5023043e58f7d4a73aa60a21524b6d9441 (patch)
tree8afecdddd7a0e00368634bf68b9ce2fa2932500d /libs/androidfw/FileStream.cpp
parent881cd9dcaf0354f84dda8cfd9fa68ded244e665d (diff)
parent7c2e560e20de536acd23f0a02de5e423193a2e2a (diff)
Merge "Abort queued-sleep transition if display shouldn't sleep anymore" into udc-dev am: 9961274383 am: 7c2e560e20
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23605786 Change-Id: I2cc5c15a234b7a8c9eeb5045923470636be7b2f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions