tree da8e72852737d0874d52e985fa5c38bfc14487bb
parent 046decca29376aba5b97b78900bfd867ca3f310c
parent 9854dfaf1d6a001d41538598a1ae3322d112ec9b
author Kenny Guy <kennyguy@google.com> 1437050559 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437050561 +0000

Merge "Show disabled trust agents as off." into mnc-dev