summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-10-01 17:07:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-01 17:07:21 -0700
commit569c5d1f09842dcea808be028dc74430e7197d65 (patch)
tree1f0d342cbed2ea50622e9a4e941d45ace6afca65 /opengl/tests/gl_basic/gl_basic.cpp
parent5a8176d4856909958b8ac95f39fcf71e96ffd5ce (diff)
parentd9018f09331eb3665ca9b6faf847482ef836f64d (diff)
am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
Merge commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039' * commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039': Add "none" for vold and deprecate mkobb -c
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions