OSDN Git Service

am 43366b2c: Merge "Add KeyStore storage type to Settings UI"
authorKenny Root <kroot@google.com>
Fri, 29 Mar 2013 23:45:15 +0000 (16:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 Mar 2013 23:45:15 +0000 (16:45 -0700)
commit47704d08b8756d78d426100b97a4fa81b81f12b3
tree1a1345b72ec5314d96ca1a3530493d07b8fa7f0d
parentab6a6645b01312816fe0688c76b5a26948252850
parent43366b2c546045f3b554427bc6e97a6b529ab66a
am 43366b2c: Merge "Add KeyStore storage type to Settings UI"

* commit '43366b2c546045f3b554427bc6e97a6b529ab66a':
  Add KeyStore storage type to Settings UI