OSDN Git Service

Merge "KeyStore: add API to query storage type" into jb-mr2-dev
authorKenny Root <kroot@google.com>
Fri, 29 Mar 2013 21:24:35 +0000 (21:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 29 Mar 2013 21:24:35 +0000 (21:24 +0000)

Trivial merge