diff options
| author | 2023-09-18 23:35:35 +0000 | |
|---|---|---|
| committer | 2023-09-18 23:35:35 +0000 | |
| commit | 635fdf8484159009d50b6625f56eb15a7d601ccb (patch) | |
| tree | 695593c9d63cd6d6c7ff43dfc4982029e98fc43e /libs/androidfw/AssetsProvider.cpp | |
| parent | 745d5c9f6f2169efc0d43851ce038ea8236bd5ab (diff) | |
| parent | affa140930bbe43980d67dd16bb74a01bbf7893f (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -s ours am: 8fbbc0c975 -s ours am: 3371c14a70 -s ours am: 306ac20464 -s ours am: 8f78484790 -s ours am: 3b02f9e5bd -s ours am: d37d6b74da -s ours am: 92475fa215 -s ours am: affa140930 -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: I342d91926a552b0edc4088931cabe045fc30aa44
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