diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-04-01 10:00:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-01 10:00:08 -0700 |
| commit | 5969285a3c37e2937d9d8ad6b977e3fa4e879d32 (patch) | |
| tree | a02db8ec4f9529c70a90e48822c7a21f2ac18b25 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f96f63d9ceb298ac3eb50eebd5f65e13761aaaff (diff) | |
| parent | 08326ed4e402454e3f8478a0286a94012e464e58 (diff) | |
am 4ba57a4e: am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo
Merge commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578' into kraken
* commit '4ba57a4e0ab56126e54d5c7137cfda1d47845578':
Fix for bug 2558156: Encodig is null
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions