From: Zoltan Szatmary-Ban <szatmz@google.com>
Date: Thu, 11 Sep 2014 09:34:24 +0000 (+0000)
Subject: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
X-Git-Tag: android-x86-6.0-r1~671^2~632^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=12b90be92b66f96f8ab81cc8938abbac8bd0b429;p=android-x86%2Fpackages-apps-Settings.git

am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev

* commit 'f572fdd132c796448064f919dcbe22ae70659aa8':
  Fixing Trusted Credentials Settings crash
---

12b90be92b66f96f8ab81cc8938abbac8bd0b429