Skip to content
Commit 641ea634 authored by Kenny Guy's avatar Kenny Guy Committed by Android (Google) Code Review
Browse files

Merge "DPMS shouldn't remove admins that aren't crypto aware." into nyc-dev

parents 567704bc 44fc4aeb
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