diff options
| author | 2023-09-22 20:44:35 +0000 | |
|---|---|---|
| committer | 2023-09-22 20:44:35 +0000 | |
| commit | 2923e0bdef6ea8598bb2419747a6b1082ee4df21 (patch) | |
| tree | 14d89ece7ac7cfe6fbcd54e2e9ebaa5b286c1b79 /libs/androidfw/AssetManager2.cpp | |
| parent | 8b5ef0b19f36b73e1f5a7f47cd58bfeb0502aed0 (diff) | |
| parent | 02912212c5014fc65b40946b926457239f98f9b3 (diff) | |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa1291380 -s ours am: 02912212c5 -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: I153f222be1eb7d288e267212a3303fff825b8690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions