commit | 6a0dedfcaf8a25be0db338c52087ddad5e949a60 | [log] [tgz] |
---|---|---|
author | Jamie Gennis <jgennis@google.com> | Fri Jul 22 16:24:03 2011 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 22 16:24:03 2011 -0700 |
tree | 88ded83d9598727cd20fbce1c26b638fbfbb5f91 | |
parent | 037f347dc29a41d1934b99bce16b0ccd3f331452 [diff] | |
parent | 7b305fffc39d0fe0926e7fd2d7f6a524fbce62b7 [diff] |
Merge changes Ibd261f7b,Ifdd234ef,I0e2f0bc3 * changes: SurfaceTexture: add the abandon method. SurfaceTexture: add a deadlock scenario test SurfaceMediaSource: remove getAllocator method