tree fcf60e712c8ec063d65d20af892cd7fd3e822c75
parent 772a14e5620569503b6f94684490c10b42d06de7
parent bec296ff25144025ad03a00cf3e560440d27e974
author Jerry J. Wang <jerryw@google.com> 1308780931 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308780931 -0700

am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2

* commit 'a5342f1a63559e03b64b93c36b3b1e4b69d2990f':
  Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)