OSDN Git Service

am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
authorAlex Klyubin <klyubin@google.com>
Thu, 6 Jun 2013 22:28:52 +0000 (15:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 22:28:52 +0000 (15:28 -0700)
* commit '60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
  Ensure all active Device Admins are listed.


Trivial merge