summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Marzia Favaro <marziana@google.com> 2023-09-15 21:43:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-15 21:43:36 +0000
commit7bc2322a032ee8fcf5a903b0c6d3b88313a80748 (patch)
tree65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/FileStream.cpp
parent77bc47ccc2a60108dd3253762003a2708fd47be5 (diff)
parentff53f5a27357e1d609afa0d26e6b3311d109473d (diff)
Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: fa1f3f3cb0 am: ff53f5a273
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341230 Change-Id: Ibdff8018517b1d9c3944b2475e7d675c0cfca72f 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