tree 0837287e8c1e5524bff771d974c5401ab1b96fac
parent 5d1dc7c9814ca3d82ddf144cdad28b672659c21e
parent fb8c84d84cd21ad292af167a27e7a7f856294ca4
author David Turner <digit@android.com> 1312967278 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312967278 -0700

am fb8c84d8: Merge "opengles emulator: Workaround Cordy (Unity) bug with intel driver."

* commit 'fb8c84d84cd21ad292af167a27e7a7f856294ca4':
  opengles emulator: Workaround Cordy (Unity) bug with intel driver.