| commit | 4a6acc04ca6982114a24c85cc1220bc216d4d867 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@android.com> | Wed Aug 24 09:20:24 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 24 09:20:24 2011 -0700 |
| tree | 9c09345c466e1a1cfcb9a57c45725781b2a90443 | |
| parent | 011acd64edd3d484c0705c426b8d2d3b69f3f997 [diff] | |
| parent | d8079c1ecc97504021115865af1e704d4414e2e6 [diff] |
am d8079c1e: Merge "emulator: opengl: Avoid conflicts with SDL_CONFIG" * commit 'd8079c1ecc97504021115865af1e704d4414e2e6': emulator: opengl: Avoid conflicts with SDL_CONFIG