tree 30bdf7b80c3dbde18b0ded36e47f4770167418b8
parent 8d65d5ff0aec24f9e8e9d160a870cb8ec532bf74
parent 08898593f2c035bd6280230068db1aac4308bcd8
author bohu <bohu@google.com> 1424219492 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424219492 +0000

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 '08898593f2c035bd6280230068db1aac4308bcd8':
  back port gles fix to api 17