Madridi/manifest — pull request #3 by Madridi (2014-05-11 14:22:51+00:00)
Title: Add FFMPEG and stagefright-plugins to the project

Change-Id: Iec58ed53f953304d8b78fd7561548fa771b33349

Conflicts:

default.xml