commit | 22dfb02a970905812b4e6a4d1cdbf5355ee7ffe0 | [log] [tgz] |
---|---|---|
author | Chun-Wei Wang <wangchun@google.com> | Sat Oct 28 17:02:47 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 28 17:02:47 2023 +0000 |
tree | 0cbf5d82ec8505644c20e52a6b9834cf5215dcd7 | |
parent | dcfe408812a5e27d1dc39f4e2735480a5bf2874b [diff] | |
parent | 00e81ec1a4fb7a1c7b35482d1d96247cf03a34c7 [diff] |
Merge "Enable lockout timeout" into main am: f9668c392e am: 00e81ec1a4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2804813 Change-Id: I5f3db1558f3c110632ec67671e7a60560e1ea8b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>