tree 8fd634808e07a118ff3ce4bbf36d4636ec726efa
parent 3bf1beeda1e9793cc1c488af5c6011657980123f
parent 3ba4f8b8018846ff167e3f7e4e465d91d6847c19
author David Turner <digit@android.com> 1312965856 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312965856 -0700

am 3ba4f8b8: Merge "opengles emulator: fix bug in glTranslatex"

* commit '3ba4f8b8018846ff167e3f7e4e465d91d6847c19':
  opengles emulator: fix bug in glTranslatex