diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2010-10-04 08:36:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 08:36:27 -0700 |
| commit | e09a54e3cb4bb7b7f592832776fbf37c5cb9e1ff (patch) | |
| tree | 8a2ad642b3eb79903546ed32f689a47927a9a405 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d113938bf816d5a656d65dc8b132a9b206f0ba53 (diff) | |
| parent | 255f7cb02a5f54562efaf54ddd044c1d0d0fc2d2 (diff) | |
am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp
* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
Refrain warning when not appropriate. Do not merge
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions