OSDN Git Service

am 5ff26209: am 6cd90f45: Merge "Don\'t show TrustAgent entries when no security...
authorJim Miller <jaggies@google.com>
Fri, 8 Aug 2014 00:57:11 +0000 (00:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Aug 2014 00:57:11 +0000 (00:57 +0000)
commit87b7cc1a26b295b64955a0899a7088c981f17edb
treea3a811ae6f95552fe6278f0eb49a3543679a67d7
parent874532737336e9ff2a460424385a98cee4c9c127
parent5ff2620928084f1e206341bcf62d08b581c8cff5
am 5ff26209: am 6cd90f45: Merge "Don\'t show TrustAgent entries when no security is enabled." into lmp-dev

* commit '5ff2620928084f1e206341bcf62d08b581c8cff5':
  Don't show TrustAgent entries when no security is enabled.