From: Kenny Guy <kennyguy@google.com>
Date: Thu, 16 Jul 2015 13:15:57 +0000 (+0000)
Subject: am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev
X-Git-Tag: android-x86-7.1-r1~1317^2~2^2~230
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=00a82a4e;p=android-x86%2Fpackages-apps-Settings.git

am 29d1b0d0: am 705faddb: Merge "Show disabled trust agents as off." into mnc-dev

* commit '29d1b0d0f4e7760ee1ed317b303a6c4ec54adda7':
  Show disabled trust agents as off.
---

00a82a4e1b125a25ec3c92e90dbc3de986124813