diff options
| author | 2023-09-22 20:55:49 +0000 | |
|---|---|---|
| committer | 2023-09-22 20:55:49 +0000 | |
| commit | 27e32bad88e55c0ccbf0bf05a1f8b2ad219b860a (patch) | |
| tree | 395403f819289bec012abd32dfe4a3a551313d25 /libs/androidfw/FileStream.cpp | |
| parent | 749d17059222463496c1b8a44bfde870414f3485 (diff) | |
| parent | d2983294ed774099d4c44a001e030c18d6e8906d (diff) | |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f32e -s ours am: d2983294ed -s ours
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae42365 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427
Change-Id: I8389c24b944ca578934f0f79d479e4f9e43b38c0
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