OSDN Git Service

am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deacti...
authorAlex Klyubin <klyubin@google.com>
Thu, 6 Jun 2013 22:33:46 +0000 (15:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 22:33:46 +0000 (15:33 -0700)
commita65fa934f19ebfe59a8458be733e783292ad8d9c
tree7d0a0fb72d6542885eec9188edda2ce93d478888
parent0c32da7ee01f7f523a889c5faf1a449e664f8bce
parent8bfb859e3b81a9b6448c17cfb02a0aa748580231
am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev

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