diff options
author | Eric Fischer <enf@google.com> | 2011-03-29 12:27:29 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-29 12:27:29 -0700 |
commit | 7d5ae7537858d6b01ae2ce12e34cb0a284138ccf (patch) | |
tree | d81220182b52788497da14fb7a943cc4f7a2e5aa /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fae5e2894ff3c09f27efac2a7ee6b9cfd4ed14b0 (diff) | |
parent | bc2489e4c55ca7ae06afe1f3449135aa48359165 (diff) |
am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions