OSDN Git Service

am 4fb1f873: am 56604046: am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a193...
authorAlex Klyubin <klyubin@google.com>
Thu, 6 Jun 2013 22:45:28 +0000 (15:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 22:45:28 +0000 (15:45 -0700)
commitd28c849e435356a42a4232a1d13da7ba9183d53c
tree23720a23915e48e44191cf24a3c54f44adb78931
parent133581e267f513d00a8e50a80fded16535f2821d
parent4fb1f873bb3ef0182bc995be9ee017a8fd41fc3b
am 4fb1f873: am 56604046: am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.

* commit '4fb1f873bb3ef0182bc995be9ee017a8fd41fc3b':
  Ensure all active Device Admins are listed.