tree 9f27f656aa4eaa02901908753eadc7620ccf504f
parent 6d80d477391c6ad14a6bcdb044c3351de4e20481
parent 0ffbbad5b1ad34bb2add06f7ec030191ed94e866
author Alex Klyubin <klyubin@google.com> 1370557796 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370557796 -0700

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

* commit '0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
  Ensure all active Device Admins are listed.