diff options
| author | 2023-10-03 19:19:13 +0000 | |
|---|---|---|
| committer | 2023-10-03 19:19:13 +0000 | |
| commit | 99a7448b5b2b29f7b591894edeb68cf9f63c2382 (patch) | |
| tree | 9cbfe6539d18bf180cbddd3083b59edcd4818003 /libs/androidfw/AssetManager.cpp | |
| parent | 63fe378e1609b1cad2949e39f7dc738f57fee158 (diff) | |
| parent | be822171e8a0203f8c5fb8e58b979dfa2a160577 (diff) | |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9f1 am: 4f8e0db44f am: af9de2e62c am: 8efa785f9b -s ours am: be822171e8 -s ours
am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e672 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005
Change-Id: I86a5af217fdec364b05c4d3676fef3dbab9ac3dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions