summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Texture.java
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2011-11-28 19:53:58 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-28 19:53:58 -0800
commit4e5d3f2ca05b513640d3163155756e01ae577d54 (patch)
treeb4c1802630b01cbd3d1af6335c465b2f00c50d8f /opengl/java/android/opengl/Texture.java
parent051606150a80efa71b139e9d52fe6c8b2c02c884 (diff)
parent99b4523b753f35122e23e90c95f57399c3f8bb10 (diff)
Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
Diffstat (limited to 'opengl/java/android/opengl/Texture.java')
0 files changed, 0 insertions, 0 deletions