diff options
| author | Eric Fischer <enf@google.com> | 2011-03-18 16:58:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-18 16:58:44 -0700 |
| commit | 05058b05b0b0dec37b0dc9ac1919aa2dfe2c86d3 (patch) | |
| tree | bb725e31391cb55853f595abd07cb876d8d5d197 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2ba648bcba32940e908cbbb77ad8a60a0e28bb02 (diff) | |
| parent | cfb05dc67e4fd8c0c078d31bf5404ad915b80030 (diff) | |
am cfb05dc6: (-s ours) am 9ac82606: (-s ours) am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit 'cfb05dc67e4fd8c0c078d31bf5404ad915b80030':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions