summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-08-25 16:33:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-25 16:33:57 -0700
commite4bdb9fac2af2242865586ba31c232a7086f8b8a (patch)
tree1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp
parent1442c725ffb568be23dde62c490c1c5b300e706f (diff)
parent85e9b6dd592797012eafcd42b96a82661216369b (diff)
am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
Merge commit '50395e80718e77d27ec5e2d474b255e05de68d82' into gingerbread-plus-aosp * commit '50395e80718e77d27ec5e2d474b255e05de68d82': Fix a fun bug with multiple service bindings from an activity.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions