| commit | e5c71c69901ff165e8cceb06fe10b0882e5f8635 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 09 19:51:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 09 19:51:15 2021 +0000 |
| tree | c66290452393b8fd7c3a20ef91d8446d4e268c41 | |
| parent | 3f2ba9c9950f19cf881ddd541c927f92407b7b48 [diff] | |
| parent | d74f2129d3ab35000618eec29a084f015dcba47b [diff] |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: d74f2129d3 -s ours am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 875fa991aa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293 Change-Id: I09559db4221b80dc2fa564183c38765ad7f27f13