Skip to content
Commit dd894ae8 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: 208512ae -s ours am: e8f11035 -s ours am: ffdad637 -s ours

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

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

Change-Id: I47c940c34f0f0859b37cfb26848b758d7e09a3fd
parents aff01722 ffdad637
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