tree 7d0a0fb72d6542885eec9188edda2ce93d478888
parent 6f28e3420ade08f05588d35937b772ffb5cdaf83
parent 8d5aeffa7dc27eba60fe4c64be6a89e645091958
author Alex Klyubin <klyubin@google.com> 1370557920 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370557920 -0700

am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev

* commit '8d5aeffa7dc27eba60fe4c64be6a89e645091958':
  Permit deactivation of malformed Device Admins.