summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-06-15 14:07:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-15 14:07:54 -0700
commitc00630b2c0cf52228d1342d8043e51471bb80ed4 (patch)
tree01e09e2a5586c79999831795bce23b509374fcce /opengl/tests/gl_basic/gl_basic.cpp
parent0be468aa0782f901609fcba39e98a52d6a9676a2 (diff)
parenta260990eae62966bbcd188e0eb3dc9fc9c3ab075 (diff)
am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
* commit '5af3405f0d24c853bd10eb239c081e31972d3e1d': Fix lease duration handling
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions