tree 86ec0477d4bfc53f842d1cd6b90474bad8e5bb5a
parent c3b673b99cb8e5650355bcb27079dc92b38dbb12
parent 0b21f4863bb56f7f5e159dd1cb8dbdba364a7c3e
author David Turner <digit@android.com> 1314011726 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1314011726 -0700

am 0b21f486: am b5588b2e: Merge "opengles emulator: fixes flashing effect on Mac"

* commit '0b21f4863bb56f7f5e159dd1cb8dbdba364a7c3e':
  opengles emulator: fixes flashing effect on Mac