| commit | 9eb39ab27fdd1e149cddb0ca175c6b05605ff582 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@android.com> | Wed Aug 24 09:27:46 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 24 09:27:46 2011 -0700 |
| tree | b69922f2f037a5e7481a97245ada12a90b9262e8 | |
| parent | 96fafad0ca29b8213c813a5fd8af1807cd6b5625 [diff] | |
| parent | 6479d059feb638a7230379621fdd54b86eee5951 [diff] |
am 6479d059: am 4a6acc04: am d8079c1e: Merge "emulator: opengl: Avoid conflicts with SDL_CONFIG" * commit '6479d059feb638a7230379621fdd54b86eee5951': emulator: opengl: Avoid conflicts with SDL_CONFIG