tree dde61ece0f1d12a4085280966933f4af318c67d6
parent 219a9d5b01446b6197bbf3253db666f5445bef8b
parent 13700b08cb1f6405f0b27434d42d03864e00e41f
author Andreas Huber <andih@google.com> 1362700577 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1362700577 +0000

Merge "Disable our fancy logic to respect both sink and source's native formats" into jb-mr2-dev