summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-24 16:58:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 16:58:27 -0700
commit62318794cf23099205a040d6c13c1426f2401767 (patch)
tree9535013ef46bc8c2bb119e23ead0c28f5b894a94 /opengl/tests/gl_basic/gl_basic.cpp
parent7d95b2f46ced1e2cb37a25b2f3e27e7fa9b15bcc (diff)
parent016a98d8f2ae9eef666e3b449834c4c46b248b02 (diff)
am 6cf1a8bf: am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
Merge commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca' * commit '6cf1a8bfb04aead9cee5f59df4529a79c0a92dca': Some StrictMode API changes.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions