| commit | 2e0a01f48f55d41d13d95eb0949794a91d366619 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 11 11:19:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 11 11:19:18 2021 +0000 |
| tree | d756a02f41ac08a8ab21b263042765e540d6dac0 | |
| parent | 579a6a2fbbda8d12e203664135d7c81e427b1539 [diff] | |
| parent | 333f5c979bc4f12527b4187c698724a843059168 [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: aff0172222 -s ours am: 333f5c979b -s ours am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1692babe5e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14679690 Change-Id: I1cffaf405c843438da21d6de7356ee26ef557508