diff options
author | Dan Albert <danalbert@google.com> | 2014-06-20 22:40:25 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-20 22:40:25 +0000 |
commit | 70c47d70257bb9c448ef935c0c3ae7dfe2f9c07e (patch) | |
tree | ee1e75f16200d3f7ebebea35d2ffb5b4c4872f3c /rs/java/android/renderscript/ProgramFragment.java | |
parent | 02616aff5acac6f12864716baaa8eab656367afa (diff) | |
parent | a642a9ea3b2288b431ecb284b94a4657ae62889d (diff) |
am a642a9ea: am d24f5577: Merge "Use openssl\'s SHA1 instead of bionic\'s."
* commit 'a642a9ea3b2288b431ecb284b94a4657ae62889d':
Use openssl's SHA1 instead of bionic's.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions