summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-20 13:12:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-20 13:12:28 +0000
commit65b9bde4a0b37f6e172b4c8e303f44c218f21e9c (patch)
tree7e601ddc54fead2ef664988dc4473dfad35f2d08 /libs/androidfw/FileStream.cpp
parent31af7513962ae0e18b4bd4b44a23da93245bbdcd (diff)
parent180adcfe38b9e14078a711678be2dd1669a16518 (diff)
[automerger skipped] Require permission to unlock keyguard am: 55b8322714 -s ours am: 77955b229e -s ours am: f578d21224 -s ours am: 5355aaa46e -s ours am: 180adcfe38 -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/+/24342146 Change-Id: I5a34b06ca83d273a795959b8aa18776bf6f71030 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