tree d8b3ef9e8948a8c58c4d0fe8245a5b0cdc184ada
parent c0046aab0c4a5fd3ae091040c739652a0a4c029e
parent 261eb0cbef1f3f7d3cde49d628b9c1e82dabcb76
author Andreas Huber <andih@google.com> 1274980614 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1274980614 -0700

Merge "Better sniffing of MPEG4 content by checking for a compatible sub-brand." into kraken