summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRoman Nurik <romannurik@google.com>2012-01-12 13:38:01 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-12 13:38:01 -0800
commitba6eb25ba2226f3db4838b072c211b39816ce9b7 (patch)
tree55b97842be7f16d95c900294374a2a2a41f6bc27 /opengl/tests/gl_basic/gl_basic.cpp
parent5bd7c88fc7a51296e814d420aa96133a1ae7a426 (diff)
parentcec1831ed9ed5d0caf26a033e3101d2921b3c3ee (diff)
am 0786bc73: am baa88ef7: Merge "docs: minor Design Principles fixes for Android Design" into ics-mr1
* commit '0786bc734e55b40a16d1a475f311c5460ff55d36': docs: minor Design Principles fixes for Android Design
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions