| commit | c544887b56749280ef188a3d039be6022aa24e9b | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Mon Sep 05 14:53:28 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 05 14:53:28 2011 -0700 |
| tree | 88a7f0b6d1d34a8b0a336a4dc9f49adcc0dfa407 | |
| parent | ef6776fd03be96af75182043c25e201c6d98fd56 [diff] | |
| parent | 08b997c7421735252fa927d89f22ab6ceba0bff8 [diff] |
am 08b997c7: Merge "SurfaceTexture: fix a test deadlock" * commit '08b997c7421735252fa927d89f22ab6ceba0bff8': SurfaceTexture: fix a test deadlock