OSDN Git Service

am 6cd90f45: Merge "Don\'t show TrustAgent entries when no security is enabled."...
authorJim Miller <jaggies@google.com>
Thu, 7 Aug 2014 22:29:33 +0000 (22:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Aug 2014 22:29:33 +0000 (22:29 +0000)
* commit '6cd90f45b7fb7324eef9d05ae38e0e26bfc934d5':
  Don't show TrustAgent entries when no security is enabled.


Trivial merge