tree 6cc052a83db2c41fe3f0843790abe473be1b1154
parent 9794f90368550dba8693a30c61c4bea5c4fb2993
parent 4194b3898df867a5c4377de49ddc72ad3e51122b
author Jesse Hall <jessehall@google.com> 1364502154 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364502154 -0700

am 4194b389: am 0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"

* commit '4194b3898df867a5c4377de49ddc72ad3e51122b':
  frameworks/native/opengl: Fix build with gcc 4.8