diff options
| author | 2023-09-18 23:36:11 +0000 | |
|---|---|---|
| committer | 2023-09-18 23:36:11 +0000 | |
| commit | cf8885b1e57f2a8a75674f275e68d3dbd58c0790 (patch) | |
| tree | 695593c9d63cd6d6c7ff43dfc4982029e98fc43e /libs/androidfw/AssetsProvider.cpp | |
| parent | f23fc0d9aa06c9bed0118a4835f599c2da6b8175 (diff) | |
| parent | 840771ad12f4ce6befcfd6c299cee279fb343e6a (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: 1e4cc975ff -s ours am: 5c31ee97b0 -s ours am: 7873a6eeb6 -s ours am: bae5248258 -s ours am: 840771ad12 -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: Id29954827fbef85d5869ec2091b05fe0e251d874
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