tree a2c441b3c4b666c1640e2fe24ec2b70d09953c2e
parent 467eb0566ff1df320c9a9be3da0f44ee3d6bc9fa
parent 3f8d4d840894468f2be8a5b56ff266cef2d71c50
author Alex Klyubin <klyubin@google.com> 1431552816 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1431552977 +0000

Merge "New AndroidKeyStore API in android.security.keystore." into mnc-dev