From: Chris Palmer <palmer@google.com>
Date: Tue, 28 Sep 2010 17:44:16 +0000 (-0700)
Subject: am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread
X-Git-Tag: android-x86-4.4-r1~2817^2~67
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e2ab45972af13c30bb98848813313603670c8965;p=android-x86%2Fpackages-apps-Settings.git

am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread

Merge commit '88fdee27e97900173be2b1f4f86c25a7c381969c' into gingerbread-plus-aosp

* commit '88fdee27e97900173be2b1f4f86c25a7c381969c':
  Improve the add-device-admin layout.
---

e2ab45972af13c30bb98848813313603670c8965