tree f57756acd46309de1902289aeab466041c2ea123
parent ae70719852919ca3a7ed614481380e2ad14d97a3
parent 385ae28d2c9a96ac89c6ebcaa5fe4b021029dd9f
author David Turner <digit@android.com> 1312964285 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312964285 -0700

am 385ae28d: Merge "opengles emulator: fixing pointer size bug."

* commit '385ae28d2c9a96ac89c6ebcaa5fe4b021029dd9f':
  opengles emulator: fixing pointer size bug.