diff options
| author | 2023-09-18 22:25:59 +0000 | |
|---|---|---|
| committer | 2023-09-18 22:25:59 +0000 | |
| commit | 6e05fd32349d39123ead496cdfc5763744ae220b (patch) | |
| tree | 22661ac57cd423cb3d5bb9356fa8b6b23d87f30f /libs/androidfw/StringPool.cpp | |
| parent | 23e70d13370e38d9d93098bd704e0467cddf7606 (diff) | |
| parent | 2e0b66376233df7806059c318597f59fc03a3eef (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: 2e0b663762 -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: Ie55b0180a77c6f1b80c94d5b3344687f7ab1332d
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