| commit | c9c9886577225e682ca1d47faeefb8f2c656f3f6 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 11 10:34:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 11 10:34:30 2021 +0000 |
| tree | c7a4adb04bbabf94339dd71ad418c489a1546d09 | |
| parent | 1f0a6621ad9c6862c823db11e407b26bdc5144b9 [diff] | |
| parent | c3d061d3c685dbfe135292d58ab819567cee8e72 [diff] |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14679690 Change-Id: I3cd073fac31b45437ebcd1a43084f0675e2151eb