diff options
| author | Baligh Uddin <baligh@google.com> | 2012-12-03 21:19:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-03 21:19:29 -0800 |
| commit | 5868368bd5780a46d43bd283859615b13d00ff82 (patch) | |
| tree | bfd958cb96112831d9af671feae52c9ff18df152 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cabdbfcbda4e0cef17dfd2f678db4d610d6bcd3a (diff) | |
| parent | 333833541c7c69fcb6849fdd0b7fe9067f60000a (diff) | |
am 33383354: (-s ours) am 52190903: am d8567b66: am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '333833541c7c69fcb6849fdd0b7fe9067f60000a':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions