tree b50176dc9b12ff78d541e36c5fab3935c19af83f
parent 37ba60c470aad28a7b37cb4d61da9384b514b3c9
parent 37ac3401d7d36197fcec0d3c831069cb837ca850
author David Turner <digit@android.com> 1310425618 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310425618 -0700

am 37ac3401: am 2319e183: Merge "egl emulator: fixes for covegl conformance test"

* commit '37ac3401d7d36197fcec0d3c831069cb837ca850':
  egl emulator: fixes for covegl conformance test