commit | 364df11fdde782fb9c8ef32acb4cd24db322a646 | [log] [tgz] |
---|---|---|
author | Alex Johnston <acjohnston@google.com> | Wed Apr 21 09:17:43 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 09:17:43 2021 +0000 |
tree | 681fa0d030fa288c643a28fdf2edc276dce35566 | |
parent | d064a2bffddbeab1b0b259f995c23ab14d50f7e9 [diff] | |
parent | 2f9b5b6ad7d8edbec48e81cc2726507ea946bab6 [diff] |
Merge "Fix maximum time to lock" into sc-dev am: 2f9b5b6ad7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14109359 Change-Id: I3e6717637d45e7b5470bbd85c5a6df3dcb68b499