diff options
| author | 2023-10-02 22:09:52 +0000 | |
|---|---|---|
| committer | 2023-10-02 22:09:52 +0000 | |
| commit | 90e2742b5f573fa3d1ac92e319514afe9f449e22 (patch) | |
| tree | 9fd41f3dfb3886a5cf6ebb1c79dd631eab1d6b76 /libs/androidfw/ObbFile.cpp | |
| parent | 693e117e687f9056027d71f466ef9540bb88d67e (diff) | |
| parent | 100f2fd86aba5a14c5e4b8b4146e329e36d3c48b (diff) | |
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: 996896e672 -s ours am: 12913fd327 -s ours am: 727968f0d9 -s ours am: f4b8f6ad22 -s ours am: 3e6f7a7f04 -s ours am: 100f2fd86a -s ours
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24757286
Change-Id: I72f20bee932a7d1c79c9d788dd316ac3d62dcf24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions