From: Alex Klyubin <klyubin@google.com>
Date: Thu, 6 Jun 2013 22:28:53 +0000 (-0700)
Subject: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins.... 
X-Git-Tag: android-x86-4.4-r1~95^2~16^3~21^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=089d161588f07862ac1e8876a39227e4110b2bec;p=android-x86%2Fpackages-apps-Settings.git

am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev

* commit '01dbfbf9c3e14253b7c3a2e822c55c013d0e4b17':
  Permit deactivation of malformed Device Admins.
---

089d161588f07862ac1e8876a39227e4110b2bec