tree 600d6eb38017e82c598cfce16671a5a9bee3d3c0
parent 3ba3156e134953a88648ab8a732b291651eaafa4
parent 3b987d0cd7225feee6813a4893eeefe4f0974d40
author David Turner <digit@android.com> 1307371814 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307371814 -0700

am 3b987d0c: am a2c959d5: Merge "fixes for gles2 tests"

* commit '3b987d0cd7225feee6813a4893eeefe4f0974d40':
  fixes for gles2 tests