diff options
| author | Eric Fischer <enf@google.com> | 2011-03-04 13:56:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-04 13:56:52 -0800 |
| commit | 16c5c456067ac2cfc20df78864d736aa55c5ce72 (patch) | |
| tree | be30817485eb28183ce3da644120e62e54fd2cc3 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 06b0e5899525330119f27f0f7d9898db6f73e0e2 (diff) | |
| parent | 2f3148445ff7d6df74b7a1b07858c379157e12df (diff) | |
am 2f314844: (-s ours) am 4d3e7fb7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '2f3148445ff7d6df74b7a1b07858c379157e12df':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions