summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-18 22:30:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-18 22:30:42 +0000
commit4b1316f125a1116de4145af28dc58197e534f39f (patch)
treeb665ad8977b76f72750ccdac72984896e863f618 /libs/androidfw/FileStream.cpp
parenta3593ecc1814a6ad46ea59c1198baf9cc3501dce (diff)
parent2f7a437c819ed6225a38919ae554932ce74aa390 (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: 2f7a437c81 -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: I3f853f217fb6cbfa1b6825fc207217ee3652d250 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