diff options
| author | Eric Fischer <enf@google.com> | 2011-03-29 14:15:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-29 14:15:22 -0700 |
| commit | b8c7c66de23b9b20f3992722bb5e346d8e12dd0e (patch) | |
| tree | ae8ccc83833841a4b427cffaa62437c85043d8b4 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c1192096627f2f9da534cb8ab7b449d6ea82123f (diff) | |
| parent | 0664a4b18c3dcea82891a7389976a9d62ac7bc61 (diff) | |
am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '0664a4b18c3dcea82891a7389976a9d62ac7bc61':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions