| commit | 981913babf87b8dea78e6a30128ef6907108fba2 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Apr 09 20:34:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 09 20:34:56 2015 +0000 |
| tree | 7220f300dfaa83b03d5c41367d287cb712aa4aba | |
| parent | 27077471a309e3bdb35521435872bc2a2b483411 [diff] | |
| parent | 098833c59d8b3984e3983169b460198c2d5e2670 [diff] |
am 098833c5: am ec01623b: am aeae0f38: Merge "Add asymmetric crypto constants for AndroidKeyStore API." * commit '098833c59d8b3984e3983169b460198c2d5e2670': Add asymmetric crypto constants for AndroidKeyStore API.