| commit | 8b40ea5fc66bfc8f457d34e51cb5ec51f01d23c7 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Jun 20 23:21:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 20 23:21:52 2014 +0000 |
| tree | 6484ad9c30a42eec7ac2bc83179114cb0e0df591 | |
| parent | 3281442aa75872b8947f0b0a5203257c6849129d [diff] | |
| parent | 70c47d70257bb9c448ef935c0c3ae7dfe2f9c07e [diff] |
am 70c47d70: (-s ours) am a642a9ea: am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s." * commit '70c47d70257bb9c448ef935c0c3ae7dfe2f9c07e': Use openssl's SHA1 instead of bionic's.