diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2010-09-10 11:29:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 11:29:54 -0700 |
| commit | 7f9c52076a4f9c022c515fa9165cd7a1bda48342 (patch) | |
| tree | 9a7df8ac6775e0425ea28e429e271d85701b7710 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 13c2d16ed6c1840c51185cec7b682e6649425940 (diff) | |
| parent | 778f695119bf1d1b44317cfa093189093ceee152 (diff) | |
am d4e722b7: am 34763928: Merge "add ART for inet connection condition" into gingerbread
Merge commit 'd4e722b74f4a5c58db03dd94d79f192c0a9b3004'
* commit 'd4e722b74f4a5c58db03dd94d79f192c0a9b3004':
add ART for inet connection condition
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions