Skip to content
Commit 9d215d9a authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Give Keyguard 2 seconds to finish before SLEEP" into udc-dev am: 26f32604 

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



Change-Id: I3febc5968259929f6ad9f205be44ed14768dc6bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb8050ee 26f32604
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