summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-11-16 07:33:58 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2011-11-16 07:33:59 -0800
commitc7403258528a08ab74f7c29277d0c34ba6edc53d (patch)
treeb18d9306d1f0eae596ec734cb309a0757ebc6046 /opengl/java/android/opengl/Texture.java
parentbd7836846c1e5d3610ba6c26686674d429a4316c (diff)
parentdd701b84aa9e09cc60ac6e90b6f01a80bee77baf (diff)
parentfd1d05a01a704db47f6e60425c0ac3e1bd4cffbf (diff)
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I8f772da03379c9d701c4eefaf58897497a83a4d3