summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-08-31 13:25:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-31 13:25:42 -0700
commit62175f89dc53ef68cbacf512e8c1379183da925a (patch)
tree9feeafe4715ba3fd56518327734041217c1c5415 /opengl/tests/gl_basic/gl_basic.cpp
parent38d4fb7b15305798d715323aec625aa7de29953e (diff)
parent00807f5ab9f53c48f05319d8510aa41be0ba6ea7 (diff)
am 6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread
Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp * commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca': Add some encoding parameters for the "record" utility
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions