summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-08-02 09:36:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-02 09:36:15 -0700
commit62f95f628c28525b93e19364c422727b489e6ce9 (patch)
treee729af738a12a7a30c3a2f09fa715a45c08c0243 /opengl/tests/gl_basic/gl_basic.cpp
parent133a135e79661d76b0d0e726a5e49f56940268f9 (diff)
parent3fcc418cff36f90a3aef8212d12ad4e92105c635 (diff)
am 77a66069: am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit '77a66069eb8fa0b99d090effa1d71b1fec992bdd' * commit '77a66069eb8fa0b99d090effa1d71b1fec992bdd': Doc change: Add nexus one to dev phones.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions