summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2012-01-24 11:42:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-24 11:42:21 -0800
commitb945a6844bac53609269d28273ab00c64d103d7c (patch)
tree62ae95e5606b65456e4877a437dfcb3020b7cee1 /opengl/tests/gl_basic/gl_basic.cpp
parent0877ec44ac272b1c7ea4d4fd0bffc48282d2612a (diff)
parent4d5a59c80de5a13d5ddc2cb07b2dbf3411d49320 (diff)
am f449ea9e: Merge "Use the carrier-given dns addrs for tethering." into ics-mr1
* commit 'f449ea9e96162698f4ec6d62c70750eb50744da7': Use the carrier-given dns addrs for tethering.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions