From: Zoltan Szatmary-Ban <szatmz@google.com>
Date: Tue, 9 Sep 2014 11:12:09 +0000 (+0000)
Subject: am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
X-Git-Tag: android-x86-6.0-r1~671^2~651^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7413c1fae4679700ef362fbdaa91ae332953b8d1;p=android-x86%2Fpackages-apps-Settings.git

am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev

* commit '574db4269528c7277f6e14a44156909fdb063190':
  Update Trusted Credentials screen in settings
---

7413c1fae4679700ef362fbdaa91ae332953b8d1