OSDN Git Service

am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2
authorJack Palevich <jackpal@google.com>
Fri, 6 Nov 2009 08:25:44 +0000 (00:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Nov 2009 08:25:44 +0000 (00:25 -0800)
commita9e47546a5132b30a2ed1e24d9193d4db09ef323
tree496054740c8e481497fb631d32740bf6486ac968
parent78e502df5163e8bcdd803af7f0a3958322a288dc
parent79447b2087c8c820d742185dda7305101f9656f0
am 79447b20: resolved conflicts for merge of 84872738 to eclair-mr2

Merge commit '79447b2087c8c820d742185dda7305101f9656f0' into eclair-mr2-plus-aosp

* commit '79447b2087c8c820d742185dda7305101f9656f0':
  Improve GLSurfaceView to avoid deadlocks and race conditions.