summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-03-25 11:01:02 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-25 11:01:02 -0700
commit05f14e2bcf78be62b35e85902408ea66103a3881 (patch)
treecd7f4ee311df6e9332bc44252a37220c881604ad /opengl/java/android/opengl/Texture.java
parent568845a766cddc4e4c222b4d9de064f8a48da990 (diff)
parentc0e0dbb45446e5e0f7f131f2180c946778e7d711 (diff)
Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions