diff options
| author | 2023-09-15 17:21:06 +0000 | |
|---|---|---|
| committer | 2023-09-15 17:21:06 +0000 | |
| commit | 620b89a869bd91dfbd8b2a14f874e472e87e6eed (patch) | |
| tree | 36997cb3135098552666868813ec81aee69ed432 /libs/androidfw/AssetManager.cpp | |
| parent | 89a3862e5d389a88ecd6a974a28648e0e3747314 (diff) | |
| parent | ea9e51e3cd62ff8e26c18d4d3c6e660abbbdabdd (diff) | |
[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -s ours am: ea9e51e3cd -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341231
Change-Id: Ib079ba4c58903aa23d5a75e2884d61d093a680fc
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