diff options
| author | 2023-09-18 23:35:59 +0000 | |
|---|---|---|
| committer | 2023-09-18 23:35:59 +0000 | |
| commit | f23fc0d9aa06c9bed0118a4835f599c2da6b8175 (patch) | |
| tree | 695593c9d63cd6d6c7ff43dfc4982029e98fc43e /libs/androidfw/AssetsProvider.cpp | |
| parent | 635fdf8484159009d50b6625f56eb15a7d601ccb (diff) | |
| parent | e64d39250afdacdeabb3d8cc3f6a4695aa0598d1 (diff) | |
[automerger skipped] Require permission to unlock keyguard am: 7f28e3eaaf -s ours am: cbdde0eb62 -s ours am: f4eace9709 -s ours am: 7c2b1325e9 -s ours am: 219d6da566 -s ours am: 7b2ead4023 -s ours am: 2acb7db524 -s ours am: 7344e5a881 -s ours am: ee5ce751e3 -s ours am: e64d39250a -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: I87eee136f646155c7f951ea5f11ecf92e30b8f29
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