tree f54454da2b674ac4cd28e0381a1a2c4bb90ab733
parent dedcb46019fae19d5f81f6924025e5ba54a1ec20
parent 47706d40ab7ceaac975bd7859258d8b4d5bc6c4a
author David Turner <digit%android.com@gtempaccount.com> 1312379431 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312379431 -0700

am 47706d40: Merge "GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS"

* commit '47706d40ab7ceaac975bd7859258d8b4d5bc6c4a':
  GLES2 translator: workaround for nvidia bug with GL_VALIDATE_STAUS