tree f870ef423619df811c8f1d8553b158472508244b
parent 54311fdcdff3639354e06ea2b77a8a9285607002
parent e263e20ff8d9056f01896d15e5011c8af4716c1b
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