diff options
author | Kenny Root <kroot@android.com> | 2013-09-25 09:36:50 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-25 09:36:50 -0700 |
commit | 7d343236f34dbc2ee2771d3e42f881019ec1aa6a (patch) | |
tree | 4042a09a6c6334d163ba0b7d29955ea877bbfdd1 | |
parent | 4820022b5edb0d19e268d836c25aa628b4378aba (diff) | |
parent | 6d06b01cf4237bd43b6e13f1683fcfc4dae83e78 (diff) | |
download | system_core-7d343236f34dbc2ee2771d3e42f881019ec1aa6a.zip system_core-7d343236f34dbc2ee2771d3e42f881019ec1aa6a.tar.gz system_core-7d343236f34dbc2ee2771d3e42f881019ec1aa6a.tar.bz2 |
am 6d06b01c: am e245b8fb: Merge changes I9f858204,Ib35643b3
* commit '6d06b01cf4237bd43b6e13f1683fcfc4dae83e78':
mincrypt: merge the two RSA verifiers
mincrypt: support SHA-256 hash algorithm
0 files changed, 0 insertions, 0 deletions