summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-06-21 14:44:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-21 14:44:13 -0700
commit1dc1e4ccca280291067723bacec4fcc1d317d511 (patch)
treefcf60e712c8ec063d65d20af892cd7fd3e822c75 /opengl/tests/gl_basic/gl_basic.cpp
parente53e18bd9d1ee20fecdef0fddb8fae5f158850d4 (diff)
parent3912a86cf1b72ae8f156a3cf7a043434f68d091d (diff)
am 885c3c11: am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into honeycomb-mr2
* commit '885c3c11cf1e20c456ddf681a06a4a878426a632': 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