tree 6ef36fa35f78283d059890c9cf641a4034783b27
parent 516dacfb02d0b0eafe21114330c98ce0e7d90da9
parent 57a339cdb7524f883de3ceb364c0b5606df0c610
author Andreas Huber <andih@google.com> 1354732706 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1354732707 -0800

Merge "setVideoSurfaceTexture is now synchronous and applied dynamically"