OSDN Git Service

am dbb975f8: am 00a82a4e: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents...
authorKenny Guy <kennyguy@google.com>
Thu, 16 Jul 2015 13:42:00 +0000 (13:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jul 2015 13:42:00 +0000 (13:42 +0000)
* commit 'dbb975f8a0dc77bbfa9578a3a394de9cbe08d7cd':
  Show disabled trust agents as off.


Trivial merge