diff options
| author | Eric Rowe <erowe@google.com> | 2010-10-18 13:56:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 13:56:31 -0700 |
| commit | b7f0eeb2b0327e664a09ac67d3ef80498b7d4e95 (patch) | |
| tree | 019ca26084abbcccb357df956b5df2b574c4e8e2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 99fddbcf44e191de19de1e4e20467c5070226ebc (diff) | |
| parent | 661ef589b87cef2c6b9bc75b07af7d01f4c7a527 (diff) | |
am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread
Merge commit '72a635a1e08c1fe316dd91786774677abb11aafa' into gingerbread-plus-aosp
* commit '72a635a1e08c1fe316dd91786774677abb11aafa':
DO NOT MERGE Add additional options and receiver to BT tests
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions