summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-06-17 18:43:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-17 18:43:13 -0700
commit7f0a1f62c63a91eab3bd21c65fa978c1b14650be (patch)
treed672efc9587b039b29c30f163c52aad8cdd82496 /opengl/java/android/opengl/Texture.java
parent2bc481861ab374f87c12b7bb816ff75ac46147f1 (diff)
parent5f11e95f0041e163e8aa9e429aec92c8ee942233 (diff)
am 5f11e95f: docs: small edits to catchup to edits made in html pushed live
Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into gingerbread * commit '5f11e95f0041e163e8aa9e429aec92c8ee942233': docs: small edits to catchup to edits made in html pushed live
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions