diff options
| author | 2023-09-16 04:14:54 +0000 | |
|---|---|---|
| committer | 2023-09-16 04:14:54 +0000 | |
| commit | deae332c7500b91a8d99600a06f51bc72f92d82b (patch) | |
| tree | 46177c9a7701d44dcb37c891ce9e0694a6d66320 /libs/androidfw/FileStream.cpp | |
| parent | 14b6d15afe123d5b3919733fcba41e808f040be2 (diff) | |
| parent | 23372a762e3b0932f7c972a0ab4f0bc0133475fe (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: af0c9c2375 -s ours am: 9aab2e9f1f -s ours am: 8a68b03e84 -s ours am: bcffca4590 -s ours am: a8f655bc82 -s ours am: 23372a762e -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: I515ad3a8e8c48ba7b88665c78247fbad25bfd1ab
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