diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-05-10 09:49:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-10 09:49:37 -0700 |
| commit | 205212ff1a3e85676ae8e493a95d877478b9b4f9 (patch) | |
| tree | b013fbb9d1d2f493488ba7f3fcebca98f88110c1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cf61c9e644787ad5213ff7f7a45c3814d3deee41 (diff) | |
| parent | d4f55816a5939d1ae708086fcf0dadde43223b6a (diff) | |
am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f' into kraken
* commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f':
Doc change: cherry-pick from master: Testing Android Applications document (concepts)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions