diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-12 08:43:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-12 08:43:53 -0700 |
| commit | 10745aabc237ff2fe582850be1883172dd7b7ada (patch) | |
| tree | 39302472f4d2e742d5de39b24bf00c2f1f14fb10 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 070909e7e6dd9988235776fc4618c18683f9d4b8 (diff) | |
| parent | 935dc55ef6b1f2192eeb76bd9e2d8b7f3bc8eca0 (diff) | |
am fe1d52d5: resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp
Merge commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f'
* commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f':
Memory leak in TextKeyListener.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions