summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-01-26 10:07:23 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-26 10:07:23 -0800
commite7b2845d685a583e8e84de369b6acfa1bebeabf4 (patch)
tree6c67a066e0f39d35cce1144ed757cb68f992bddd /opengl/java/android/opengl/Texture.java
parentcaf0ce3ca2b3deba4bcff6c920740bafd87f2b62 (diff)
parent3348f5ae6e3744049d7cdae378748998b7635231 (diff)
Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions