Commit bd7902ae authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 27177b37: resolved conflicts for merge of bafac0a7 to klp-dev 

* commit '27177b37':
  CtsVerifier test for lock screen vulnerability fix
parents 81331ee1 27177b37
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment