tree f11e3ff02bf3bc386ca87854aef2d67931fdc9a0
parent d14b0c1860c9a16297064fbec84395369bbd74af
parent 9b0d5ffbb6cc847843e7f5ae7f891000c90a5989
author Narayan Kamath <narayan@google.com> 1393001657 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393001657 +0000

am 9b0d5ffb: am f56ae199: Merge "Update GLES codegen to be in sync with frameworks/base"

* commit '9b0d5ffbb6cc847843e7f5ae7f891000c90a5989':
  Update GLES codegen to be in sync with frameworks/base