| commit | b1781e1dc1b57b16e0c1476b54ec01e409f5cc03 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Jun 10 16:02:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 16:02:05 2021 +0000 |
| tree | d90d0523809c02f62e57c54636afa6286c99af00 | |
| parent | d87e57acbc6038086dc893cbadb2807387402a2c [diff] | |
| parent | 10af722004e01fc8e8cd803bfd9b06ff9186ba95 [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: 10af722004 -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: I80d8a4b880407bdced8153e3c0fd081a462f44bc