summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Brad Hinegardner <bhinegardner@google.com> 2023-09-26 01:29:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-26 01:29:19 +0000
commitd4d4952c468fc4ca73bf1d38fdfcab9406c87a6a (patch)
treec299bf34d2674088c3438df42c1ace6bd74fd7d3 /libs/androidfw/FileStream.cpp
parent1af65858db159ad4830df058a50466003303b25d (diff)
parent21f91f5d1d25021e375e54b719c6ebc7a18ca9aa (diff)
[automerger skipped] Merge "Align lockscreen state and picker state for Device Controls shortcut" into udc-qpr-dev am: cb9ba1442e am: 21f91f5d1d -s ours
am skip reason: Merged-In Id98d0d16e11c3291dc4b906f7dd6e10d077ac96c with SHA-1 bc161c912d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24852833 Change-Id: Ib52fe30d1e3a1abd9cbfe33bd9d97009d428e8ab 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