diff options
| author | 2023-09-18 19:01:39 +0000 | |
|---|---|---|
| committer | 2023-09-18 19:01:39 +0000 | |
| commit | 184533c85618338bb1c10df1353836974455bc61 (patch) | |
| tree | e90781ad8807230e77995bd0b11c6f8474bba90d /libs/androidfw/ResourceTimer.cpp | |
| parent | 304b92883cba77abe6dc14f5785ba0ca7805d4b9 (diff) | |
| parent | 658c7832660034df48ad73c5be0e8be2878a10b0 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 0327955073 -s ours am: 5e73bd8193 -s ours am: 658c783266 -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: I56ebe8d10b90f903e304e3316e4e828c8d1a948c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions