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

am 709aab4e: am 9a70b0a9: am 54664b03: am 83e60a26: am c0948a44: resolved... 

am 709aab4e: am 9a70b0a9: am 54664b03: am 83e60a26: am c0948a44: resolved conflicts for merge of 62c86cb8 to jb-mr1-dev

* commit '709aab4e':
  CtsVerifier test for lock screen vulnerability fix
parents cdb4914f 709aab4e
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