Skip to content
Commit ccafe39e authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge changes I027cc96c,I44bb8191 into tm-qpr-dev 

* changes:
  Add a TestableAlertDialog
  Pass Secure.LOCKSCREEN_ALLOW_TRIVIAL_CONTROLS
parents a2c6879a 58e2149a
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