summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-06-21 14:29:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-21 14:29:42 -0700
commit3912a86cf1b72ae8f156a3cf7a043434f68d091d (patch)
treecc677d7f751d9900458c481845dead6e9404d065 /opengl/tests/gl_basic/gl_basic.cpp
parent41ae13e9d163f84124ffb9f8068e1da73a050c8b (diff)
parentdeab10e7bad42b30ad83189eaafddc3ce030f0dd (diff)
am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
* commit 'bc4ddef479011e200d0273fe73c22922a85de1fe': DO NOT MERGE Revert "Fix lease duration handling"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions