Skip to content
Commit 07641bac authored by Kenny Guy's avatar Kenny Guy Committed by android-build-merger
Browse files

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

am: 641ea634

* commit '641ea634':
  DPMS shouldn't remove admins that aren't crypto aware.
parents 08e5edac 641ea634
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