diff options
| author | 2023-09-22 21:43:52 +0000 | |
|---|---|---|
| committer | 2023-09-22 21:43:52 +0000 | |
| commit | ce7d7eb056f7f9d44125b1b07f40caa84e5bd477 (patch) | |
| tree | 3e7bc130e0e6eeebbd2b5c1a0daeac9aa2593868 /libs/androidfw/BackupHelpers.cpp | |
| parent | f89dc776ac94f0ab1aeef11d88f208b797ea072c (diff) | |
| parent | 012749c0e88d25865dcaa07bbd8c34e581a1853e (diff) | |
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f32e -s ours am: 3ee339a4a3 -s ours am: 012749c0e8 -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: I95ac95aef859b44cb9f16d3c9feb4fd9f0798bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/BackupHelpers.cpp')
0 files changed, 0 insertions, 0 deletions