tree 92b60341fc8c41735724b9d601a39436a90264e5
parent 8ef015be24e8eafe109f306e57146926479972eb
parent 3ceb1a04b44539c2b2c3afec6df487fe128911f2
author Alex Klyubin <klyubin@google.com> 1433881062 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433881064 +0000

Merge "Switch Android Keystore key gen and import to new KeyStore API." into mnc-dev