OSDN Git Service

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


Trivial merge