diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-04-01 09:57:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-01 09:57:12 -0700 |
| commit | 08326ed4e402454e3f8478a0286a94012e464e58 (patch) | |
| tree | 7a13d65bca39938309b90f95dfb57f45aedfe844 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ca08c653bbbd243a90558ae2dd3d37dafd038017 (diff) | |
| parent | 97ad6b768316a1b94bfcb90948afbee9aeafbed9 (diff) | |
am 70c22a48: Merge "Fix for bug 2558156: Encodig is null" into froyo
Merge commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a' into froyo-plus-aosp
* commit '70c22a48e605cd59c35ccbbc5eee05b5a30f0a2a':
Fix for bug 2558156: Encodig is null
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions