[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: 99c8d90be8 -s ours am: 77a0173a1c -s ours am: 945e3f3ad6 -s ours

Browse Source

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: I63f9e2c7585170784b87c02b816eb73026ac645b

...

This commit is contained in:

Daniel Sandler

2021-06-10 16:18:04 +00:00

committed by Automerger Merge Worker

parent 4d4784fa57 945e3f3ad6

commit 62660a48b2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available