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-07 08:22:56 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2011-11-07 08:22:56 -0800
commit064975c27cbca412e682fa152ce00af14027ab4f (patch)
tree8c9c2913538ff69746c2ceb60b85724cf3da5927 /opengl/java/android/opengl/Texture.java
parent6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0 (diff)
parentceb6cdf0635d20070504ed58ead5b9d4b48f01cf (diff)
parent829a6f208cbdcc9eecaa59d086b27b413e3227ee (diff)
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2