summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 20:27:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 20:27:57 +0000
commit073cbbf9d8f75cb658f47ec0d4460ab4fe349a97 (patch)
tree65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/FileStream.cpp
parentc190d127eb4d94ab1b21616114422cb1ba08aaa4 (diff)
parent2acb7db524ff3a8414a9eb67a64b5c607bbbb4be (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: 219d6da566 -s ours am: 7b2ead4023 -s ours am: 2acb7db524 -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: I2d51ea7607fd5c0ba3e661fd38bb1a3d49c84d9d 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