tree ef25d6bdf1acc829fb35f9d7c8febc2124a7a930
parent f8d9379bd834573feca085284970cf686993c330
parent 91216a7e7406ef02d833e461d0db93ece7b2140d
author Jack Palevich <jackpal@google.com> 1279073552 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279073552 -0700

am 91216a7e: Merge "Fix deadlock when switching between two GLSurfaceViews" into gingerbread

Merge commit '91216a7e7406ef02d833e461d0db93ece7b2140d' into gingerbread-plus-aosp

* commit '91216a7e7406ef02d833e461d0db93ece7b2140d':
  Fix deadlock when switching between two GLSurfaceViews