tree ba054d7c9a457fc3680c247da0eb0e5f975f34f1
parent 361d9df38cf9760baffc863d5364a1df9cf8be6b
parent f56ae1999948393ba8c207525d6466ee424c4467
author Narayan Kamath <narayan@google.com> 1393000969 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393000969 +0000

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

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