Skip to content
Commit 208512ae authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Automerger Merge Worker
Browse files

[automerger skipped] Fix race condition between lockNow() and... 

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

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

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

Change-Id: I434f0068024f61af13d68bd42bdcdcf93be27afb
parents f02c375c 1692babe
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment