tree 13a6e302373f8d116f78f2cdbd68f2780d02ba60
parent 2f6f1206a673365990ab70e1e06f483ea57bc39d
parent 0d026a97bb0c8715f2ce04d359935d351cd0fc44
author James Dong <jdong@google.com> 1262827561 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1262827561 -0800

Merge "Add MPEG to the file extensions that scanner cares"