summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-12-02 17:57:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-02 17:57:37 -0800
commit2a1152ac96140b12836b19479e341b299dff7d9a (patch)
tree83499f07051fcebd8448d9ee013564ebadf277d5 /opengl/java/android/opengl/Texture.java
parentf240ac99d6bc3a9c77c00fab0ff102f9da504fd5 (diff)
parent00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2 (diff)
am 00f1ac80: am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
* commit '00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2': Be careful sharing connections when dun is in play
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions