tree 9f27f656aa4eaa02901908753eadc7620ccf504f
parent f96a86c99d7505e15a39266967cf4d4d75295af1
parent 9f6a193394de16bfe398c8b7424f273231c77134
author Alex Klyubin <klyubin@google.com> 1370557920 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370557920 -0700

am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.

* commit '9f6a193394de16bfe398c8b7424f273231c77134':
  Ensure all active Device Admins are listed.