tree 180d022b7cb9ca0eac4b01f5c243b5a7d2bae897
parent 884e30343efab49f35c41b969ca5f7a6fa3c8748
parent fdabca678706b3d8133d9c37e092c59fdff54b07
author bohu <bohu@google.com> 1424220545 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424220545 +0000

am fdabca67: am 986ba2fb: am 08898593: am b71024a6: am 30111408: am 56957bdb: am 7838df56: am 423bbda8: am 65325595: am 05ecbe5f: am 9bdb1793: am 7ef22839: (-s ours) am 8ec8f605: am e591d22b: am f8ac5e31: back port gles fix to api 17

* commit 'fdabca678706b3d8133d9c37e092c59fdff54b07':
  back port gles fix to api 17