diff options
| author | 2023-09-20 10:28:26 +0000 | |
|---|---|---|
| committer | 2023-09-20 10:28:26 +0000 | |
| commit | 4bb98f38c588d2fa6c85569184c311d5343d1b44 (patch) | |
| tree | a731a05dd2f75880024316c60d3b8f8393fc0541 /libs/androidfw/AssetManager.cpp | |
| parent | f578d21224370e4aea93f0e2c42b9da76b5a4b47 (diff) | |
| parent | 3946267559f0a445eefda8e3823ba64848a9eef6 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342146
Change-Id: Ia498ab1cad9407736bdee80ed8e6bd29ac96bbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions