diff options
| author | 2023-10-03 17:15:00 +0000 | |
|---|---|---|
| committer | 2023-10-03 17:15:00 +0000 | |
| commit | 4f8e0db44fc29c3dc15801956394a8ce984e8cf6 (patch) | |
| tree | dedca82d31687b0cc2feea995dc47b76af7e1726 /libs/androidfw/AssetManager.cpp | |
| parent | fedf1c8c140564fec33c39a875efb295bddd42e8 (diff) | |
| parent | ba7a30e9f1f597997ebf699f5fdd696ec2631c54 (diff) | |
Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761005
Change-Id: I7753a5e784502b873ef2a6e34b7a5db783d6b23e
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