| commit | 6479d059feb638a7230379621fdd54b86eee5951 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@android.com> | Wed Aug 24 09:23:28 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 24 09:23:28 2011 -0700 |
| tree | 8ba1d36108ca1997acf51c8e30f91e52f61ab6ed | |
| parent | b0e1f794c08f09e4e3f30a00ca686d02a838a020 [diff] | |
| parent | 4a6acc04ca6982114a24c85cc1220bc216d4d867 [diff] |
am 4a6acc04: am d8079c1e: Merge "emulator: opengl: Avoid conflicts with SDL_CONFIG" * commit '4a6acc04ca6982114a24c85cc1220bc216d4d867': emulator: opengl: Avoid conflicts with SDL_CONFIG