diff options
| author | Eric Fischer <enf@google.com> | 2011-03-29 16:59:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-29 16:59:35 -0700 |
| commit | 248292030915b555e82c01eb6699ac458e274474 (patch) | |
| tree | eb23cd046600cc32ca3705cf13c6b8901b4b2203 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f3336393d15fef2bf2358735e39c2387b1ed58c4 (diff) | |
| parent | c9e5464b06aa6abb8db60094483a0d353515fb67 (diff) | |
am c9e5464b: (-s ours) am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'c9e5464b06aa6abb8db60094483a0d353515fb67':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions