OSDN Git Service

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


Trivial merge