tree 60dc92432f4b262fafda8648e18850b25a58e9ef
parent 4e2ecdd8a78f25f4c234877d5321ebd4e4c0e8f7
parent ea54d0dc0dfeef5560fea04667804413d522025f
author Romain Guy <romainguy@google.com> 1321939429 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321939429 -0800

am ea54d0dc: am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1

* commit 'ea54d0dc0dfeef5560fea04667804413d522025f':
  Hide ManagedEGLContext until we are sure this is the correct API.