tree 0b6132bd58b3db9962bad7c3b5b0c75c5e86e811
parent 0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf
parent 60544e74b689c5c9e6e47e6b1c50582fe37d0a70
author Alex Klyubin <klyubin@google.com> 1370557732 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370557732 -0700

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

* commit '60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
  Ensure all active Device Admins are listed.