| commit | 6bcaace5d291c5af8f18561d0c123b51c0ef3e58 | [log] [tgz] |
|---|---|---|
| author | Robin Lee <rgl@google.com> | Thu May 25 14:53:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 25 14:53:49 2023 +0000 |
| tree | 231efe84923f701454391ef3a908eb224c21b624 | |
| parent | 270f6a56733c5ad12008b5269e3d1541d63e8f73 [diff] | |
| parent | cbc30ad229ff4fcb37acb07d21cbc8fb3ce963ee [diff] |
Merge "Bring back Keyguard CANNED_UNLOCK_START_DELAY wait" into udc-dev am: c42b01e3e2 am: cbc30ad229 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23377876 Change-Id: Id1490ea548dbac9aebdea548ce840d1e15fe9af4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>