| commit | c8d8018cbad059d63708e0f368123f4568722f4f | [log] [tgz] |
|---|---|---|
| author | Chun-Wei Wang <wangchun@google.com> | Sat Oct 28 17:36:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 28 17:36:34 2023 +0000 |
| tree | 750c1102294cf0336ee4d178f4b90c8c3c7d66d6 | |
| parent | 6a03a7aa610f9d1b18f3b92a817c52d229fb41a1 [diff] | |
| parent | dcfe408812a5e27d1dc39f4e2735480a5bf2874b [diff] |
Merge "Enable lockout timeout" into main am: f9668c392e am: c3d2521ec0 am: dcfe408812 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2804813 Change-Id: I0a2d91b5f0b8fd14afc977f77a58bdd006457646 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>