| commit | be14ed48707373872ed574341f5a6ea715318407 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Jun 10 15:27:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 15:27:37 2021 +0000 |
| tree | 7bf7394a486f382e21644862f728922b77210eb8 | |
| parent | 99c8d90be8dc5fc139b7d91b7897b09b09cfa5bd [diff] | |
| parent | 51855b1f12b1d87e7625c40486c798f36e6d6509 [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 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: I4c514ab3bdfa661d5995084ebab4cf003b945086