| commit | f00cdf68cd1b96f822b3711cd4e39c9ad903ce21 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Wed Apr 01 17:57:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 17:57:00 2015 +0000 |
| tree | 1c997c61eacff8a0bf172d1dbd48b3958c6f9162 | |
| parent | 4e88ecf4bc344557af31eb367e6e01b2d5b60471 [diff] | |
| parent | c6cc9d820d007a6b11df2bb3274d40743e1f1d87 [diff] |
am c6cc9d82: Merge "A way to obtain KeyStore operation handle from crypto primitives." * commit 'c6cc9d820d007a6b11df2bb3274d40743e1f1d87': A way to obtain KeyStore operation handle from crypto primitives.