Skip to content
Commit aff01722 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c -s ours am: c3d061d3 -s ours am: c9c98865 -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/+/14679690

Change-Id: I4094450dc15f3ad37cdecd329f3d5b234224e9c3
parents 0f735a7b c9c98865
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