| commit | 089d161588f07862ac1e8876a39227e4110b2bec | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Jun 06 15:28:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 15:28:53 2013 -0700 |
| tree | cdd6829732bd49559d001976f89846401ff04413 | |
| parent | 0ffbbad5b1ad34bb2add06f7ec030191ed94e866 [diff] | |
| parent | 01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17 [diff] |
am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev * commit '01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17': Permit deactivation of malformed Device Admins.