tree 8943d9713544a130157817b742325862b8c7b3ec
parent a6f4fb1fbbaf6cb13ad6b813a4cecbc28ba02776
parent 23bf250522b7dff9acd14c5900b66b1df9c76745
author Mathias Agopian <mathias@google.com> 1318994661 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318994661 -0700

am 23bf2505: Merge "Make sure set GL state properly" into ics-mr0

* commit '23bf250522b7dff9acd14c5900b66b1df9c76745':
  Make sure set GL state properly