[automerger skipped] Fix race condition between lockNow() and updateLockscreenTimeout am: 1692babe5e -s ours

Browse Source

am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1d31270fd2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14679730

Change-Id: I434f0068024f61af13d68bd42bdcdcf93be27afb

...

This commit is contained in:

Jorim Jaggi

2021-06-10 17:50:27 +00:00

committed by Automerger Merge Worker

parent f02c375c6f 1692babe5e

commit 208512ae75

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