366f2e61fe
Merge commit 'e05e02e17463616c885784a1f0e57eeb22b13f93' into eclair-plus-aosp * commit 'e05e02e17463616c885784a1f0e57eeb22b13f93': Add basic metadata retrieval support for midi, ogg, etc.