diff options
| author | 2023-09-18 20:28:06 +0000 | |
|---|---|---|
| committer | 2023-09-18 20:28:06 +0000 | |
| commit | 2e0b66376233df7806059c318597f59fc03a3eef (patch) | |
| tree | a731a05dd2f75880024316c60d3b8f8393fc0541 /libs/androidfw/ApkParsing.cpp | |
| parent | 65f6794d8a850e6e38f1a557d9c00d3e98106cea (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: I62f8a690d63cc441954ae4c3028fe13681e47ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions