diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-03-30 09:30:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-30 09:30:32 -0700 |
| commit | 51af9642fd0a31162c5c6e199c354bf2b8683a44 (patch) | |
| tree | 3df13b324209e6ab022e8508522255c975507533 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4f90fda71f6518882a908c75611f9bb4fabebd15 (diff) | |
| parent | fce4eab91ae6b3025ba7e0fa908c6f3078f193ba (diff) | |
am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
DO NOT MERGE Pick upstream intf with valid IP conf
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions