summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorSan Mehat <san@google.com>2010-04-05 10:44:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-05 10:44:45 -0700
commit595691c9988f02337860f1cd5aa5ff5b16127505 (patch)
treeba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp
parent3f1730f9443e77bed2af5bb1eba54e2b27ad22c7 (diff)
parentda3af713fb7c904f73a8a4954ba32637dedc333a (diff)
am 9d782f62: am 73a8f26a: Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
Merge commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7' into kraken * commit '9d782f62defba898c3ebaa498ea1be9e5cb26ac7': NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions