| commit | 6d4c20323bd3e4e187538bbdebaf2ee960b2f1d1 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Jun 10 15:10:38 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 15:10:38 2021 +0000 |
| tree | 267da8dd861a33bc55353e5d407a40e1b1d05704 | |
| parent | d74f2129d3ab35000618eec29a084f015dcba47b [diff] | |
| parent | 0f735a7bb38d9793c8305affc47f9d27632f728b [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 skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673294 Change-Id: Ib2cf7693bde66b42a960f442649aa0b13bf99ae0