OSDN Git Service

am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e7...
authorAlex Klyubin <klyubin@google.com>
Thu, 6 Jun 2013 22:41:41 +0000 (15:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 22:41:41 +0000 (15:41 -0700)
commit56604046c5c46087aa5320d7c6aa6eb49c313637
tree8abd882be94551b9e1b408398ca4be17423010ca
parentadc3a2825c754084728193ebf4f88b411e5b3dbc
parent5aa3f8782432c79d01702ca6a7214793501bd476
am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.

* commit '5aa3f8782432c79d01702ca6a7214793501bd476':
  Ensure all active Device Admins are listed.