summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2009-10-13 17:18:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-13 17:18:05 -0700
commit214036a9df6b790471c27572ff4e5cd9199051f2 (patch)
treea28bca30d49b32a8d4ee7b2e279aceb2eab6b5ae /opengl/java/android/opengl/Texture.java
parent2f37ac9677ab76d66e934b138ebca803fcbbe2ef (diff)
parentd3ee3b7e2be6f7231241cde0edef9ce760eed448 (diff)
am d3ee3b7e: (-s ours) am bd6c80f6: Import revised translations. DO NOT MERGE
Merge commit 'd3ee3b7e2be6f7231241cde0edef9ce760eed448' * commit 'd3ee3b7e2be6f7231241cde0edef9ce760eed448': Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions