| commit | 51855b1f12b1d87e7625c40486c798f36e6d6509 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Jun 10 15:11:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 15:11:12 2021 +0000 |
| tree | 9c3dadf8bc2a52edb01e6da7f9e7b6e3a2a78306 | |
| parent | 548ddc79d3d597b03ebc9d653194696af4a7308c [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: Ie9162189e545ee928fb5e0845e0755191dd009b0