tree 527090578e63648aa935a56b422bb4ee1eb4f3ad
parent 9f70b92f1bca0e09fdfdeec7be053f41271478ed
parent 74ff8c23f44f1546d0c7004302f4c7ba726ff4c0
author Dave Burke <daveburke@google.com> 1331617118 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1331617118 -0700

Merge "attempt to fix a deadlock in SurfaceTextureClient::disconnect"