diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2010-09-10 10:06:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 10:06:54 -0700 |
| commit | 778f695119bf1d1b44317cfa093189093ceee152 (patch) | |
| tree | 3a3e8b93d010e337d289c228cd6109a2ba412d93 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1205c8be1b333b23335c744ab63ecf0e4865b8b1 (diff) | |
| parent | 64c9bb57d94bf7807c506cae4a82c901e606d908 (diff) | |
am 34763928: Merge "add ART for inet connection condition" into gingerbread
Merge commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea' into gingerbread-plus-aosp
* commit '34763928c995a15ee0b9ecfb7c0f4772ef20f2ea':
add ART for inet connection condition
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions