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-02 10:52:48 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2011-11-02 10:52:49 -0700
commit11b49ba933bab7ff8262139141eef0e5f3c45a18 (patch)
tree09341206f82e3109a2b13e5a1b2ffa0d2adbc03d /opengl/java/android/opengl/Texture.java
parent7a5a50c12f6a6e094d1e8aa7514df37f1176354a (diff)
parent27bc922c5b607bfdf82ba6f754967a2bd4eb39fe (diff)
parentbeb470af433368bb423c0efd57de77c0a933e7bd (diff)
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001