commit | 8d5aeffa7dc27eba60fe4c64be6a89e645091958 | [log] [tgz] |
---|---|---|
author | Alex Klyubin <klyubin@google.com> | Thu Jun 06 15:29:56 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 15:29:56 2013 -0700 |
tree | 7d0a0fb72d6542885eec9188edda2ce93d478888 | |
parent | 9f6a193394de16bfe398c8b7424f273231c77134 [diff] | |
parent | 089d161588f07862ac1e8876a39227e4110b2bec [diff] |
am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev * commit '089d161588f07862ac1e8876a39227e4110b2bec': Permit deactivation of malformed Device Admins.