diff options
author | Eric Fischer <enf@google.com> | 2011-11-15 13:10:56 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-15 13:10:56 -0800 |
commit | 0988cddae508cf9e479103fd63a342441bcad25c (patch) | |
tree | 7763de841ce8593e3120f11384234ea492217b0f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 8f62946310a7f2bf251070df4e248b9058ddd5ff (diff) | |
parent | 66adcedbc635bbce37a849824d0cefceab810535 (diff) |
am 66adcedb: (-s ours) am 3524831a: am 8d00c194: Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '66adcedbc635bbce37a849824d0cefceab810535':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions