summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 20:27:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 20:27:34 +0000
commit2f7a437c819ed6225a38919ae554932ce74aa390 (patch)
tree65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/FileStream.cpp
parent6824b6d319ef9d3597e3916c513995a77aa4141b (diff)
parent59c444b80c22b8ebab98c9230390e916e6837437 (diff)
[automerger skipped] Require permission to unlock keyguard am: 712ec1f4f8 -s ours am: 8e952270a0 -s ours am: 17b2d055ad -s ours am: 5578bf029b -s ours am: 33f66cdb7a -s ours am: 59c444b80c -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144 Change-Id: Ifa23ac0993af4e2628ae677700b5653397bb29bd 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