tree 8ba1d36108ca1997acf51c8e30f91e52f61ab6ed
parent b0e1f794c08f09e4e3f30a00ca686d02a838a020
parent 4a6acc04ca6982114a24c85cc1220bc216d4d867
author David 'Digit' Turner <digit@android.com> 1314203008 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314203008 -0700

am 4a6acc04: am d8079c1e: Merge "emulator: opengl: Avoid conflicts with SDL_CONFIG"

* commit '4a6acc04ca6982114a24c85cc1220bc216d4d867':
  emulator: opengl: Avoid conflicts with SDL_CONFIG