diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-05-10 09:43:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-10 09:43:03 -0700 |
| commit | f79e4c7fd5c0244b7653ea582b08bf92804a520d (patch) | |
| tree | 031f03af99732267299954bd3ecab17ec2a7ee8f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bd08c07d9dda3e346db957041591194d00c60386 (diff) | |
| parent | 37c990e9e279d042ffd336ce2f8e3c8ddeb46727 (diff) | |
am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit '0dd3a239519369933d4efa701479c816b4b33874' into froyo-plus-aosp
* commit '0dd3a239519369933d4efa701479c816b4b33874':
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