tree dab910387263aa0446c4300754500850c27d4790
parent 2e6f49cc810ea8c4a23d88fdeb24267a18085556
parent 32704dcff71fc2469f41b8aa48058c4818fc6908
author Jamie Gennis <jgennis@google.com> 1315259480 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315259480 -0700

Merge "SurfaceTexture: fix a test deadlock"