diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-05-10 10:14:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-10 10:14:51 -0700 |
| commit | 7dfbfe45a655af23c9ae504f9eb8a67a3a89dc23 (patch) | |
| tree | b013fbb9d1d2f493488ba7f3fcebca98f88110c1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5bc546043e9395d96874dd6b7bd2f86bae8bbf87 (diff) | |
| parent | 3ed432dff932274cacb703a24a4319103a8e5d72 (diff) | |
am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
Merge commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4' into kraken
* commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4':
String change to refer to wifi tether as hotspot
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions