| commit | 99c8d90be8dc5fc139b7d91b7897b09b09cfa5bd | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Jun 10 15:27:11 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 15:27:11 2021 +0000 |
| tree | 7bf7394a486f382e21644862f728922b77210eb8 | |
| parent | 79267151518647bf8d6f33f6515ccfcea0ec668d [diff] | |
| parent | 6d4c20323bd3e4e187538bbdebaf2ee960b2f1d1 [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: 6d4c20323b -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: I1d51594476b2a30d582c4c0a6ce94a0fa46ff2ac