summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-08-25 16:40:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-25 16:40:55 -0700
commit9da5e133f6785d46518b4fc3340267ec93ceabce (patch)
tree6ca310606cc8eca244bad34907fd7759836cb772 /opengl/tests/gl_basic/gl_basic.cpp
parent8c5f798e9a555ea194a42bc64b7558ab52b6b073 (diff)
parente4bdb9fac2af2242865586ba31c232a7086f8b8a (diff)
am fde7fdd3: am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
Merge commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c' * commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c': 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