diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-10-29 18:32:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 18:32:29 -0700 |
| commit | aa2f9f01fa820ba93eaff8916b74cbc4a2bf0254 (patch) | |
| tree | 4c4f4cf313ce2484d597dd52454f4a51acc20734 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 319b7b044c513f0e8c41cae4c2cee00cf415c5a7 (diff) | |
| parent | 81b7caf0d12fb56ab40592467d6b1cbcaef8f0b4 (diff) | |
am 81b7caf0: resolved conflicts for merge of 5214dae4 to klp-dev-plus-aosp
* commit '81b7caf0d12fb56ab40592467d6b1cbcaef8f0b4':
handle negative temperature
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions