summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2011-03-05 09:19:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-05 09:19:42 -0800
commitfc38d756b89dc1ae59e176233a8209115a153d13 (patch)
treea14464123bebfff64910d7c44b1759a699a6caa8 /opengl/tests/gl_basic/gl_basic.cpp
parent3cf6b65abd505d0bcc77607001250767259094fa (diff)
parent840137c0feb8ea6a608db939ab2780a89832b9cf (diff)
am 362da509: (-s ours) am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread
* commit '362da509897a497848860ea8b9944ab192ad1e4c': Add a protocol property to the APNs and use it.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions