summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-04-29 15:31:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-29 15:31:23 -0700
commit82b027e90efc816f96783d47cff1c088d07c7b5a (patch)
tree4d27174400406d5fb4f92801f5d146045bea001e /opengl/java/android/opengl/Texture.java
parentcd845f37ba9a6c9cdcf1cde5277707265251e337 (diff)
parent48399e38c978a66ac4c6054c8681a246dfc94b4b (diff)
am 48399e38: am 77a1beb1: Merge "Import revised translations" into froyo
Merge commit '48399e38c978a66ac4c6054c8681a246dfc94b4b' into kraken * commit '48399e38c978a66ac4c6054c8681a246dfc94b4b': Import revised translations
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions