diff options
author | Scott Main <smain@google.com> | 2011-12-15 15:58:33 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-15 15:58:33 -0800 |
commit | 35ad6be53552773b58b5e742ed388d73d126acfe (patch) | |
tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 8cb9834eed5482740197f908c11543ab970991b8 (diff) | |
parent | a5261478a0cc597d2afcf22ae193be4ef379064f (diff) |
am 19552e95: am d25ad2fd: cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
* commit '19552e95db26d96977daa42cda4de8e58c6feb0a':
cherrypick from ics-mr1 to avoid pending merge conflicts: Change-Id: If1341cdc456ace9037bd2175479d89454e084e22 docs: remove some "new" tags from side navs
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions