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