diff options
| author | 2023-09-22 19:53:48 +0000 | |
|---|---|---|
| committer | 2023-09-22 19:53:48 +0000 | |
| commit | 3ee339a4a38c63229c5acdb973bc85e7b8ff73a8 (patch) | |
| tree | fd6fea3a88afc6fad4b23c01fcaf417f97e78da8 /libs/androidfw/AssetManager2.cpp | |
| parent | 02912212c5014fc65b40946b926457239f98f9b3 (diff) | |
| parent | b708c4f32ed4ee7e2cddad6e1e7e7baa73aa55c9 (diff) | |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f32e -s ours
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae42365 is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23088548
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427
Change-Id: Ib6e1f206aeafbf716192e5c423ca193a0ede4049
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