diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-03-30 15:18:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-30 15:18:23 -0700 |
| commit | b57cb5bfb7473638b1a6e7b8a099ab8929dccd0d (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8be27ca06c6e4ef3838f63d1b6a5be05ae6de700 (diff) | |
| parent | 51af9642fd0a31162c5c6e199c354bf2b8683a44 (diff) | |
am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '11ebb6f5020761b9b8373a5e0d777fb91a2b92c2':
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