diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-09-22 23:39:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-22 23:39:53 -0700 |
| commit | f647fd1d1d969a924ac0a98369f103f6258a9de1 (patch) | |
| tree | 81e904ced86ff0d345781382171a55eb7a73bce6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b60e98c3274ab881d83f85159c652aa97c2a9329 (diff) | |
| parent | dfc4bb68aa866f39cf2b9440213e8a9577c50a40 (diff) | |
am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom
* commit 'b849074cb58edc15b0764afdde0326c0b6d5b147':
Tell the resolver what protocols to use.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions