| commit | 10af722004e01fc8e8cd803bfd9b06ff9186ba95 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Jun 10 15:36:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 15:36:27 2021 +0000 |
| tree | 0056124f6e1a090496ff0fbe249650cc55db6187 | |
| parent | 6f8491a1e6f36301d007c381c6d94cf5296903b2 [diff] | |
| parent | be14ed48707373872ed574341f5a6ea715318407 [diff] |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours am: 51855b1f12 -s ours am: be14ed4870 -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/+/14673294 Change-Id: If1db7e9abb064412ae95c9e4203e0f8299c4dba2