| commit | 448bc9bb1c2dad274b101c42b853ba986bd3facb | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Wed Nov 30 14:50:43 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 30 14:50:43 2011 -0800 |
| tree | 1fd44da99dabe440251fffd263cb41c5a0aa5a13 | |
| parent | a4df9c36e45a76d3835984f9a54b9ea85028e26b [diff] | |
| parent | 342a30daa9556d45238bc6e07530c15987687dd5 [diff] |
am 6b77115d: (-s ours) am 3e843769: DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource. * commit '6b77115da5de1e6d82a1e96e30ffdb3f1a90a54d': DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.