summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-16 04:13:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-16 04:13:22 +0000
commit88e3a16606d99b6924c70fd4c2477acb8e593d3d (patch)
tree46177c9a7701d44dcb37c891ce9e0694a6d66320 /libs/androidfw/FileStream.cpp
parent2def522777cb47fa7bc41d799d9e4d754f6ab941 (diff)
parentb65f7fd4d438680cf0522f5c9d8ca25fb699e650 (diff)
[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -s ours am: ea9e51e3cd -s ours am: 620b89a869 -s ours am: 7c2f597c46 -s ours am: 511dee9523 -s ours am: d9fe035e60 -s ours am: d51ad40ab0 -s ours am: e03b724523 -s ours am: e5ec0c6e37 -s ours am: b65f7fd4d4 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341231 Change-Id: Ia711f0037c184f60ae61156ce54a1b0690eb83dc 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