OSDN Git Service

am a65fa934: am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge...
authorAlex Klyubin <klyubin@google.com>
Thu, 6 Jun 2013 22:35:41 +0000 (15:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 22:35:41 +0000 (15:35 -0700)
commit5d21820a979cac6d9a7426b5a5aed4b65e3cc67b
treeb9a94398aca88cfe784a7e63af206614ee62957b
parent5aa3f8782432c79d01702ca6a7214793501bd476
parenta65fa934f19ebfe59a8458be733e783292ad8d9c
am a65fa934: am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev

* commit 'a65fa934f19ebfe59a8458be733e783292ad8d9c':
  Permit deactivation of malformed Device Admins.