tree cc721606a9c10f5e173f04081352f93faf3d6dcc
parent fbc8b8861ce819cdac180fdf8d9f8ce3e82f3201
parent 3001e4721237af2754fc2ac57100dd4ea00c67cb
author Andreas Huber <andih@google.com> 1316638569 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316638569 -0700

Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"