diff options
| author | 2023-09-18 19:45:26 +0000 | |
|---|---|---|
| committer | 2023-09-18 19:45:26 +0000 | |
| commit | 53c30c888be355e654351f16c0cf828e30f7311a (patch) | |
| tree | 71e5b12a06e8eda0703b07a616806867c44c5241 /libs/androidfw/StringPool.cpp | |
| parent | ecfbb8106474544873cd496a7c8c155ad81b2d51 (diff) | |
| parent | 53937710031cb2f4fec03d422e77cd934ef96443 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469a6 -s ours am: 2964d2acf8 -s ours am: 5bc4960863 -s ours am: 5393771003 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342145
Change-Id: I6916bb210234fd1036379f28e120198839d74d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions