diff options
| author | 2023-09-18 18:46:37 +0000 | |
|---|---|---|
| committer | 2023-09-18 18:46:37 +0000 | |
| commit | 4eef0a5a1ce7fef3d69dfae0a21deb3f64bbd875 (patch) | |
| tree | 74e7ef040b9f4f8dcc356542909059e7fb504d3f /libs/androidfw/AssetManager.cpp | |
| parent | d577fd099b7519347d7c074ee2d7d9956fa20b2f (diff) | |
| parent | 5e73bd81930a5de71254691ed2d460fee638dd3f (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 0327955073 -s ours am: 5e73bd8193 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c0042 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24342147
Change-Id: I64428acd1f98d9f16d54f64433fb9edfa12be4a4
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