diff options
| author | 2023-09-18 23:35:24 +0000 | |
|---|---|---|
| committer | 2023-09-18 23:35:24 +0000 | |
| commit | 745d5c9f6f2169efc0d43851ce038ea8236bd5ab (patch) | |
| tree | 695593c9d63cd6d6c7ff43dfc4982029e98fc43e /libs/androidfw/AssetsProvider.cpp | |
| parent | c2a8792adf0cb4337e95d0d19206d921a3c680c9 (diff) | |
| parent | bebc7481f775875cdcfaa5a8216c9b8daaa14152 (diff) | |
[automerger skipped] Require permission to unlock keyguard am: 712ec1f4f8 -s ours am: 8e952270a0 -s ours am: 17b2d055ad -s ours am: 5578bf029b -s ours am: 33f66cdb7a -s ours am: 59c444b80c -s ours am: 21c03be91c -s ours am: 187aace6a7 -s ours am: bebc7481f7 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342144
Change-Id: I26ee45d70a5c57e4c26a4e365a265d07b72e32f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions