tree 1fe554f46fb6b612fbd464984a2937464da29e27
parent 338acd6869532f2684cbd1e4f273eaffc6d4ef6d
parent d9be16f920f7c2581fda3ca495c1e6fc88857a6c
author Elliott Hughes <enh@google.com> 1380321484 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380321484 -0700

am d9be16f9: Merge "Fix OpenGL stub exception handling."

* commit 'd9be16f920f7c2581fda3ca495c1e6fc88857a6c':
  Fix OpenGL stub exception handling.