Skip to content
Commit b81944de authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Android (Google) Code Review
Browse files

Merge changes Ibc9d5374,I28a14ab9 into tm-qpr-dev 

* changes:
  Fix parental control dialog
  Fix NPE in QSSecurityFooterUtils
parents be4e61e5 05bfd051
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