Skip to content
Commit 6a69a2c8 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev

parents 34526c1c 8982038d
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