diff options
| author | Xia Wang <xiaw@google.com> | 2010-04-07 10:36:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-07 10:36:31 -0700 |
| commit | 1a5472e812b0530c721bb32cab3bc1214edec57f (patch) | |
| tree | ec1cb255bbdad108ce60ceb7267e305a4f0f34e6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f7610d26ea3719c36cd89a2a8d6407bea751bb83 (diff) | |
| parent | f8f27eeccc9548cec4a03d898d73eabd0582ccf8 (diff) | |
am b151f48a: am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Merge commit 'b151f48a06d9473a8ec079d928d4203d13e2568b' into kraken
* commit 'b151f48a06d9473a8ec079d928d4203d13e2568b':
Fix bug2537659
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions