diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-05-10 09:49:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-10 09:49:13 -0700 |
| commit | 46bd7e9d0a2d98725e57c016128347be55d56c28 (patch) | |
| tree | 40243a4bf95b5bfe4f7f264691cba165c15fe081 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2ff1971b68e723d79a5d701028c33f8ed28fa1ea (diff) | |
| parent | f79e4c7fd5c0244b7653ea582b08bf92804a520d (diff) | |
am aff856d0: am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f' into kraken
* commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f':
Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions