commit | 1f0a6621ad9c6862c823db11e407b26bdc5144b9 | [log] [tgz] |
---|---|---|
author | Daniel Sandler <dsandler@android.com> | Thu Jun 10 14:25:04 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 10 14:25:04 2021 +0000 |
tree | c7a4adb04bbabf94339dd71ad418c489a1546d09 | |
parent | e72a13d44c3bfefb81819c859f4eff77580b1ec1 [diff] | |
parent | 7e742dca13071a1ccbed2ad27222b07309ce75ab [diff] |
Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673294 Change-Id: I52ec38b96a54250bf25ef0da255e20b7a2f65f71