summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2011-03-05 09:26:55 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-05 09:26:55 -0800
commit4a9018438215c386a91497e200db4bf02665ee3b (patch)
treea95e04107ee69d5add34d89a3c8814ede4970e36 /opengl/tests/gl_basic/gl_basic.cpp
parent17cb99710f059cfcd1597ce88cee0dc8922564c0 (diff)
parentfc38d756b89dc1ae59e176233a8209115a153d13 (diff)
am eeab6905: am 362da509: (-s ours) am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread
* commit 'eeab69056d3648c04a1aca23381dba621c6c2658': 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