diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-19 18:11:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-19 18:11:44 -0700 |
| commit | 2ddd3e119d5bd49f483f9bc8b9a5bfecdf14d3ae (patch) | |
| tree | 7ca7e20fe87fa8cfc030f8bba6aef1f3d7a12e93 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 376cdd6d595d9db4276366fcf623787c1060670d (diff) | |
| parent | ad5081352142e62fc33d5bfe8769912fadda9036 (diff) | |
am 5b930c49: Merge "SIP: add config flag for wifi-only configuration." into gingerbread
Merge commit '5b930c49b12bdb1461a18491db768c642c38d498' into gingerbread-plus-aosp
* commit '5b930c49b12bdb1461a18491db768c642c38d498':
SIP: add config flag for wifi-only configuration.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions