tree 8a4f76e6abd0cdec5d3a5da8cae675cc64f72b40
parent 26969262c02f7f26bd47962cff511b3b966550b4
parent 3aca01d3b03bdb2e312ff302d04eb36034f09384
author David Turner <digit@android.com> 1309963584 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1309963584 -0700

am 3aca01d3: am 2683b10b: Merge "opengl translator: Mac fixes for unbind context"

* commit '3aca01d3b03bdb2e312ff302d04eb36034f09384':
  opengl translator: Mac fixes for unbind context