diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-08-26 13:14:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-26 13:14:17 -0700 |
| commit | dd3b909c7a4fa52a7ee64a65f3be6c8f6c048a2f (patch) | |
| tree | 6ca310606cc8eca244bad34907fd7759836cb772 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b24337953cf6c1926764cd74e094ea974f8b3a4e (diff) | |
| parent | 39729d08a2141819dfcbaa52d2ef79b117cb14fe (diff) | |
am 4ea54f44: (-s ours) Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b'
* commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b':
Add an API to request route to an IPv6 host.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions