diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-04-02 12:53:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 12:53:49 -0700 |
| commit | 9a8c69fbfa42f19400893081e51d6ce878b13a4c (patch) | |
| tree | ba02998adcfbe8e2fb1483d418f63704657336f5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c66a143c814277e1ad3e59c0f8b0b83539539582 (diff) | |
| parent | 65e79b2e6bd6feb3ac748cb4408a72af92b9e846 (diff) | |
am 90bd9433: am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo
Merge commit '90bd943364af8af8e3409f3fffe409f724a4210b' into kraken
* commit '90bd943364af8af8e3409f3fffe409f724a4210b':
Dont start wifi if in airplane mode
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions