summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-05-14 23:16:31 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-14 23:16:31 -0700
commit74368e0bb6b9fb85aa1063dd463f0b50310becfe (patch)
tree2e6c7cfa32c293f7fd4aa65eb772567fe6465e65 /opengl/tests/gl_basic/gl_basic.cpp
parentfdcc3559ac9c0e4857f84f8745acb73061e1eb0b (diff)
parent41613ed3bfa1d4bd3b084cdf2aa558b8086b1825 (diff)
am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with API description." into froyo
Merge commit '5f1beda18fc7709c2e61ace33607513770faf115' into froyo-plus-aosp * commit '5f1beda18fc7709c2e61ace33607513770faf115': Make the SSID field of WifiConfiguration consistent with API description.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions