summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2010-09-01 11:32:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-01 11:32:16 -0700
commit260c04a4c5ab82e092e09559647c03a6fa6c53d2 (patch)
tree5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp
parent027d496183f62a8f2fecbfe61e027e9350343bd1 (diff)
parente35742b5d560f4304f91db00cc0a330ccbad86dd (diff)
am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread
Merge commit '1614843e93d98910147380969d034009ecb23aa2' into gingerbread-plus-aosp * commit '1614843e93d98910147380969d034009ecb23aa2': Fix invalid comment in WebSettings.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions