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 | 3a0d1a46294eb182a66bef69f4037a9b40820e2c (patch) | |
| tree | 432ee236345d35d91cd790b6b59d3f388ac34b04 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7bbb199912bd4bc7b4827358bcdd90acc826e7fa (diff) | |
| parent | 311bb7fcc145115675adc7e5f1567dce479d4899 (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