diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2008-12-19 08:05:35 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2008-12-19 08:05:35 -0800 |
| commit | 02e120bdff339ef1f7718c3c129366ed09e57000 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fcfe48e7cf461bf4a6314802c0f31f292d87ab95 (diff) | |
Merge commit 'remotes/korg/cupcake'
Conflicts:
phone/com/android/internal/policy/impl/PhoneWindowManager.java
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions