tree cfe95cd7a4448741f465432b9178d9e87f20c7d3
parent cfff3894e3d18816769eb574f9d6204e6926c571
parent 9bdb1793b0d7b02f626d853a44f4adbe6847366e
author bohu <bohu@google.com> 1423862867 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423862867 +0000

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

* commit '9bdb1793b0d7b02f626d853a44f4adbe6847366e':
  back port gles fix to api 17