am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp

Browse Source

* commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2':
  StagefrightMediaScanner: Call endFile() for MIDI and OGG files.

...

This commit is contained in:

Jean-Baptiste Queru 2010-11-19 16:56:49 -08:00 committed by Android Git Automerger

parent 6bca1b0809 f863896d52

commit 9b99eb350e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available