tree 4006325d3dfc64853745823222f8cf33fa096092
parent b0a97a52dffa5ea3520cb2ff58681c2782b53160
parent fe7655914de3852093c35600df996824d03ddf63
author Jim Miller <jaggies@google.com> 1407450346 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1407368960 +0000

Merge "Don't show TrustAgent entries when no security is enabled." into lmp-dev