diff options
author | Scott Main <smain@google.com> | 2009-12-19 12:36:05 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-19 12:36:05 -0800 |
commit | a1c2e5d0bc289fdd4aa05b0aebc5ef3cc42958ee (patch) | |
tree | 6bf953b2264ce9bee701391b2fc869ba8fb8b0fa /opengl/tests/gl_basic/gl_basic.cpp | |
parent | bb750606b3ac32b2343a9c2e3fdb4814dc97c1c7 (diff) | |
parent | d4a56ac92e5d27238cd81fc71fa8228d58470fbe (diff) |
am 5508987b: am e4c2a376: Merge change I2703edac into eclair
Merge commit '5508987bfcdd9a441966893ee21c6cf7803c0b49'
* commit '5508987bfcdd9a441966893ee21c6cf7803c0b49':
docs: add new device features for the uses-feature
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions