OSDN Git Service

am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev
authorAlex Klyubin <klyubin@google.com>
Fri, 7 Jun 2013 00:51:57 +0000 (17:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Jun 2013 00:51:57 +0000 (17:51 -0700)
commit3c862fb5b66666c96011d065af5d7bf14ed1a2fc
tree1619069fdcc31416848dd8f023516ff69196bd21
parent4fb1f873bb3ef0182bc995be9ee017a8fd41fc3b
parent681b21f3e4ef0a63d982eca0e9d1896422bc30ff
am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev

* commit '681b21f3e4ef0a63d982eca0e9d1896422bc30ff':
  Permit deactivation of malformed Device Admins.