diff options
| author | Scott Main <smain@google.com> | 2010-10-11 15:15:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-11 15:15:09 -0700 |
| commit | d71f246ca43b9ba58fb3535a0e0d9edf68b59887 (patch) | |
| tree | 8ab99edb9a508a8c01320d67eb2471021ea1a005 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ae275c583d09fb5dc6d93f5f594e740139aafa06 (diff) | |
| parent | a2e686914dbfe57f791f516f1306f1ad5f7c0dca (diff) | |
am 3d90d11a: am 3fd40ee6: (-s ours) Revert "docs: new web apps dev guides" Do not merge.
Merge commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0' into gingerbread-plus-aosp
* commit '3d90d11a7b6d2b1c49e5890306a06f01646392b0':
Revert "docs: new web apps dev guides" Do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions