commit | d8079c1ecc97504021115865af1e704d4414e2e6 | [log] [tgz] |
---|---|---|
author | David 'Digit' Turner <digit@android.com> | Wed Aug 24 08:16:59 2011 -0700 |
committer | Android Code Review <code-review@android.com> | Wed Aug 24 08:16:59 2011 -0700 |
tree | 9c09345c466e1a1cfcb9a57c45725781b2a90443 | |
parent | d98b3782a72ca20bf83f15be2782df460503f592 [diff] | |
parent | e2dda380174cb0c866a01c1fe0c8c77775ebed83 [diff] |
Merge "emulator: opengl: Avoid conflicts with SDL_CONFIG"