summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorPeter Ng <petergng@google.com>2011-10-28 10:53:54 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-28 10:53:54 -0700
commit63dd319ebeea0421f8bf901b85b753dde1de74d7 (patch)
treea82fabea70798b3431b94bd0b9161015d2db0d52 /opengl/java/android/opengl/Texture.java
parent65793dc043eee43790137f79beeba7ed8b123902 (diff)
parentc9a0d7dfda78def90a615504cb56445c4904424c (diff)
Merge "Lockscreen on tablet is now using the same waveview widget as phone" into ics-mr1
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions