summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-12-02 16:54:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-02 16:54:04 -0800
commitb3e9629420561df38ccbee2806fccb8dd0569a0a (patch)
tree48623910fe75822605f4a4c5884e8b8bcd745d86 /opengl/tests/gl_basic/gl_basic.cpp
parentd9345730212e019d0b26b5fb0d1b8284a332da77 (diff)
parentd76faf39631b7256820e7ed13a6783b90326a8c5 (diff)
am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
* commit '2a7b5ab16af697f386ad7ae346e1bf9229086fa8': Be careful sharing connections when dun is in play
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions