tree 34649d6a10e1e288e77cab8487d77c9f899a75d5
parent fc31df1f124949003cec31b6d009afba78eb571e
parent 423bbda847062e910f292a6eeaa91c246e72e44a
author bohu <bohu@google.com> 1423864271 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423864271 +0000

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