commit | 3c862fb5b66666c96011d065af5d7bf14ed1a2fc | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Thu Jun 06 17:51:57 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 17:51:57 2013 -0700 |
tree | 1619069fdcc31416848dd8f023516ff69196bd21 | |
parent | 4fb1f873bb3ef0182bc995be9ee017a8fd41fc3b [diff] | |
parent | 681b21f3e4ef0a63d982eca0e9d1896422bc30ff [diff] |
am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev * commit '681b21f3e4ef0a63d982eca0e9d1896422bc30ff': Permit deactivation of malformed Device Admins.