diff options
| author | Scott Main <smain@google.com> | 2010-08-02 09:29:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-02 09:29:49 -0700 |
| commit | 3fcc418cff36f90a3aef8212d12ad4e92105c635 (patch) | |
| tree | 81e3f34c8345b60f834f7ae515dab583345d0835 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4a6d42004c56c33508c32c345ded22a1a72778ae (diff) | |
| parent | aa57958f8856e382ed4079158d138719589c95ec (diff) | |
am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo
Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp
* commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368':
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