| commit | aff0172222e6958b837744dc76e61df685fd58b2 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 11 10:48:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 11 10:48:25 2021 +0000 |
| tree | 006e60cf5c8173518908e11163435e76f2f87e1f | |
| parent | 0f735a7bb38d9793c8305affc47f9d27632f728b [diff] | |
| parent | c9c9886577225e682ca1d47faeefb8f2c656f3f6 [diff] |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -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: I4094450dc15f3ad37cdecd329f3d5b234224e9c3