tree 9f27f656aa4eaa02901908753eadc7620ccf504f
parent a9a28d2feeccdd2deacf6fcfb96abfcdeed58ddf
parent 6f28e3420ade08f05588d35937b772ffb5cdaf83
author Alex Klyubin <klyubin@google.com> 1370558025 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370558025 -0700

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

* commit '6f28e3420ade08f05588d35937b772ffb5cdaf83':
  Ensure all active Device Admins are listed.