diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-10 15:09:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 15:09:46 +0000 |
| commit | a68e318834b3486c0426689df4df686dd297a5dc (patch) | |
| tree | d1a86bbf1e85017ad6fb73ed284c3cd18bc9888b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f1c595e9fab80d9c3ee9e8f204ce75e134eb09cf (diff) | |
| parent | d4c590f4c0d753af39ca725958a22d9cc3e9ba71 (diff) | |
am d4c590f4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'd4c590f4c0d753af39ca725958a22d9cc3e9ba71':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions