tree 49402e2794b06b7ce718fd12ba14f1237abaceaf
parent 5e44138c090c13b4f04a2e57a514806d531e119a
parent 7ef22839c336926a16072ea0e5d83dd125bd0b2f
author bohu <bohu@google.com> 1423862597 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423862597 +0000

am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17

* commit '7ef22839c336926a16072ea0e5d83dd125bd0b2f':
  back port gles fix to api 17