summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2011-12-02 13:22:15 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-02 13:22:15 -0800
commit511c45337f38365e0fada658f8c242b17eb8291c (patch)
tree48623910fe75822605f4a4c5884e8b8bcd745d86 /opengl/tests/gl_basic/gl_basic.cpp
parent5c33d1cadf31e8fccaa8657720b48157bcf53ec6 (diff)
parent1740eee1d0235bb540f785ba01a70484fd29bc6e (diff)
am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
* commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1': MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions