OSDN Git Service

am 47704d08: am 43366b2c: Merge "Add KeyStore storage type to Settings UI"
authorKenny Root <kroot@google.com>
Fri, 29 Mar 2013 23:46:39 +0000 (16:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 Mar 2013 23:46:39 +0000 (16:46 -0700)
* commit '47704d08b8756d78d426100b97a4fa81b81f12b3':
  Add KeyStore storage type to Settings UI


Trivial merge