tree cf239e7ed071728b8bb7e14b330ff71a887b449e
parent 65803c1fc73dfd52c93dd717b2cea17ac5c84dc9
parent 7284c53cfe1a4f21e487c4d312c4a5b685d82ffb
author David Turner <digit@android.com> 1308081574 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308081574 -0700

am 7284c53c: am e68305d9: Merge "Handle egl context"

* commit '7284c53cfe1a4f21e487c4d312c4a5b685d82ffb':
  Handle egl context