diff options
| author | 2023-09-18 18:55:08 +0000 | |
|---|---|---|
| committer | 2023-09-18 18:55:08 +0000 | |
| commit | 1e4cc975ff0ee6f7dabc04e94cd9205076e79428 (patch) | |
| tree | 2399ad67a9f64fe349e47f08e0eac7a15df895bc /libs/androidfw/AssetManager2.cpp | |
| parent | 7b2ead4023dc0a87df07385aa86e065f1d6fb947 (diff) | |
| parent | ed66255cab1640fbbe5bec6fd32f4e9502ee2b75 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -s ours am: ed66255cab -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446
Change-Id: Ie9deef5f2bc135a9eb854fbd63ccc6f8d7f53a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions