| commit | c3d061d3c685dbfe135292d58ab819567cee8e72 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 11 10:25:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 11 10:25:08 2021 +0000 |
| tree | 136148985aa3bcd296f15b1d19414037f0a6f4c1 | |
| parent | 7e742dca13071a1ccbed2ad27222b07309ce75ab [diff] | |
| parent | f02c375c6fd5e091246bc19befc1675ecc1ff958 [diff] |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am skip reason: skipped by user jjaggi Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14679690 Change-Id: Id3394c9a610df9c2551ccfddad1126862ab9d393