diff options
| author | 2023-09-18 12:30:40 +0000 | |
|---|---|---|
| committer | 2023-09-18 12:30:40 +0000 | |
| commit | 8d2550344c47ea0023db30bca5d9df70dfdc6e4f (patch) | |
| tree | 65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/ApkParsing.cpp | |
| parent | 44e437c53629c954291a2a698aa4c55a3fc14337 (diff) | |
| parent | 07731fb247a14ae04d825529060ac1630d856e06 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-dev am: 07731fb247 -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/+/24339445
Change-Id: I772b603640b91062d2c2cd68e78a33d224ef043b
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