diff options
| author | 2023-09-18 12:35:39 +0000 | |
|---|---|---|
| committer | 2023-09-18 12:35:39 +0000 | |
| commit | 3cc39d59173e1a523d4e9a496631445d33bf561c (patch) | |
| tree | eb85f07986af2b73b78af1e5d3d51777ceb12c74 /libs/androidfw/ObbFile.cpp | |
| parent | d6db4987178460eb41b8462d04a9b9ec85eda2aa (diff) | |
| parent | fe5181973b3c0c2be33761066437e1d1c7d20656 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into udc-qpr-dev am: fe5181973b -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/+/24339447
Change-Id: I6923c161d8a1e076fd986419a03f9d16f1d28ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions