commit | 641ea634eeebc52b7bdc825b32dc22881d63ae30 | [log] [tgz] |
---|---|---|
author | Kenny Guy <kennyguy@google.com> | Thu Feb 11 19:27:21 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 11 19:27:22 2016 +0000 |
tree | 058ac30d2ecd7d2af295e8bdb4bd1407dd0b2461 | |
parent | 567704bca22c08a6fbfdaa15d054e0e3124b38e8 [diff] | |
parent | 44fc4aeb1f3a6fcc6c1b8532530cb0589b2815c4 [diff] |
Merge "DPMS shouldn't remove admins that aren't crypto aware." into nyc-dev