diff options
| author | Trevor Johns <tjohns@google.com> | 2009-12-15 07:42:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-15 07:42:59 -0800 |
| commit | 289a1327a7fc5f5163eee2d75fe663930d6b517c (patch) | |
| tree | 7d5330152c49ca35fd3948d913acff0edebb6230 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 32399e3221ffca351aeebb0f64ce03ea5087c30a (diff) | |
| parent | 999e84618d65a091bfcaba3eeaffe718069c6dd1 (diff) | |
am 311bb7fc: Merge change I0c8814d1 into eclair
Merge commit '311bb7fcc145115675adc7e5f1567dce479d4899' into eclair-plus-aosp
* commit '311bb7fcc145115675adc7e5f1567dce479d4899':
Removing copyrighted backgrounds/logos from ContactManager and Wiktionary
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions