OSDN Git Service

am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of...
authorAlex Klyubin <klyubin@google.com>
Thu, 6 Jun 2013 22:32:00 +0000 (15:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 22:32:00 +0000 (15:32 -0700)
commit8bfb859e3b81a9b6448c17cfb02a0aa748580231
tree7d0a0fb72d6542885eec9188edda2ce93d478888
parent6f28e3420ade08f05588d35937b772ffb5cdaf83
parent8d5aeffa7dc27eba60fe4c64be6a89e645091958
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.