summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2010-08-30 08:06:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-30 08:06:36 -0700
commit3967e9d817c22f635b9be35c99a7fdce24d8fd61 (patch)
tree067764d63bcc908c546f8302083ce36e5b2e3930 /opengl/tests/gl_basic/gl_basic.cpp
parentdb9d522db39d4e969dabf795e869beb1e35f4e01 (diff)
parentbdedbf0713b4b487b20d7dbaa63183ae4f56ae6f (diff)
am 6726d6bb: Merge "Support pre-loading browser plugins on the system image." into gingerbread
Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp * commit '6726d6bb1a30167786864c445cbe0370ee0dd58c': Support pre-loading browser plugins on the system image.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions