OSDN Git Service

am 3c862fb5: am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev
authorAlex Klyubin <klyubin@google.com>
Fri, 7 Jun 2013 00:54:40 +0000 (17:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Jun 2013 00:54:40 +0000 (17:54 -0700)
commit48d6b270dd4dcc6a0d04b71a7c7319435a01a7c0
tree009beaa51b71581acecae5f2c522a77a0c968d98
parentd28c849e435356a42a4232a1d13da7ba9183d53c
parent3c862fb5b66666c96011d065af5d7bf14ed1a2fc
am 3c862fb5: am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev

* commit '3c862fb5b66666c96011d065af5d7bf14ed1a2fc':
  Permit deactivation of malformed Device Admins.