| commit | 01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Jun 06 15:26:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 15:26:49 2013 -0700 |
| tree | ef61d65f5a4ae7ecf442bacb2545ca557bc5939d | |
| parent | 60544e74b689c5c9e6e47e6b1c50582fe37d0a70 [diff] | |
| parent | efd88e2c468db2169ff9bb17f2b89c246756dcda [diff] |
am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev * commit 'efd88e2c468db2169ff9bb17f2b89c246756dcda': Permit deactivation of malformed Device Admins.