diff options
| author | Xia Wang <xiaw@google.com> | 2010-05-06 16:31:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 16:31:36 -0700 |
| commit | aea38f076c3cf0899236b5dfab718936b0857e33 (patch) | |
| tree | 98f63c0ca82ba9f2eee4cdebeddaa966c0831431 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 64c83cfb6a5b6d23a96e8ba618d7be08f18bbdb0 (diff) | |
| parent | 363809c71da861e9f4694b047054d79c534a02d3 (diff) | |
am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '3e6c1696135f267cc59d050747839c56ce868ef9' into kraken
* commit '3e6c1696135f267cc59d050747839c56ce868ef9':
Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions