diff options
| author | Mike Lockwood <lockwood@google.com> | 2011-12-02 17:57:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-02 17:57:17 -0800 |
| commit | 4eec194c86aabeaab0df0405d41dd269f7655060 (patch) | |
| tree | c13657903573c911c2ad799dc4fbcfdb1bad6565 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7c2da311b723b2d75918d3b5867f66ed05e3cb6a (diff) | |
| parent | 511c45337f38365e0fada658f8c242b17eb8291c (diff) | |
am 7bbc3c4b: (-s ours) 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 '7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2':
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