tree db754ba20ae4484aff86b66d2b5dc3e2a7de0204
parent 52667f55522c0b0f808d9a8c69d453a445eaeb31
parent 6e3ed47ab0b06e09d4b8531e05805c4b3ea0e924
author bohu <bohu@google.com> 1423862559 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423862559 +0000

am 6e3ed47a: (-s ours) am aa028a3c: back port gles fix to api 18

* commit '6e3ed47ab0b06e09d4b8531e05805c4b3ea0e924':
  back port gles fix to api 18