diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-01-15 14:50:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-15 14:50:37 -0800 |
| commit | c71c678e9b6a4278337b69f2c60c0fbe9988bf93 (patch) | |
| tree | f3bbf4e077314b0bf611a2a94ea586c559d4c4cd /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f37d9c07b258ceeea991801f9223ecf071debd08 (diff) | |
| parent | a4e10cc746caea514216f436e2065b3bbefb25ef (diff) | |
am a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-dev
* commit 'a4e10cc746caea514216f436e2065b3bbefb25ef':
Fix the single crunch command to return the right error code.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions