OSDN Git Service

Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev
authorKenny Root <kroot@google.com>
Fri, 29 Mar 2013 21:24:47 +0000 (21:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 29 Mar 2013 21:24:48 +0000 (21:24 +0000)
commitab6a6645b01312816fe0688c76b5a26948252850
tree1a1345b72ec5314d96ca1a3530493d07b8fa7f0d
parentfee612df197ab3da969dff39ecc3df95b931cfae
parent028634b6af87665c5d62b0aee669ce376cef065d
Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev
res/values/strings.xml