PAC-man/android_frameworks_av — pull request #1 by Chirag-Galani (2014-05-07 21:19:04+00:00)
Title: Same line twice

const char *MEDIA_MIMETYPE_VIDEO_VC1 = "video/vc1";
This line is added in the latest CM commit.
Check line 68 of new edited file