summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 20:24:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 20:24:48 +0000
commitfaab6422d01837e3e3adf5b69da4dc4320838d95 (patch)
tree65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/FileStream.cpp
parent15c2341cd3c7ddeb16c11bffa7c4b80a9b76626b (diff)
parentefa9ffae6af2cff9215913bc8fb976672b3db676 (diff)
[automerger skipped] Require permission to unlock keyguard am: 7f28e3eaaf -s ours am: cbdde0eb62 -s ours am: f4eace9709 -s ours am: 7c2b1325e9 -s ours am: d5d56cf441 -s ours am: efa9ffae6a -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446 Change-Id: I734833c5542e4be4c5fd31c314035cf7a94f6ba5 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