From: Kenny Root <kroot@google.com>
Date: Fri, 29 Mar 2013 23:46:39 +0000 (-0700)
Subject: am 47704d08: am 43366b2c: Merge "Add KeyStore storage type to Settings UI"
X-Git-Tag: android-x86-4.4-r1~562
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=419b49882a2f77096e60249fcec0837f7067774b;p=android-x86%2Fpackages-apps-Settings.git

am 47704d08: am 43366b2c: Merge "Add KeyStore storage type to Settings UI"

* commit '47704d08b8756d78d426100b97a4fa81b81f12b3':
  Add KeyStore storage type to Settings UI
---

419b49882a2f77096e60249fcec0837f7067774b