commit | ab6a6645b01312816fe0688c76b5a26948252850 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Fri Mar 29 21:24:47 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 29 21:24:48 2013 +0000 |
tree | 1a1345b72ec5314d96ca1a3530493d07b8fa7f0d | |
parent | fee612df197ab3da969dff39ecc3df95b931cfae [diff] | |
parent | 028634b6af87665c5d62b0aee669ce376cef065d [diff] |
Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev