| commit | 621b41c7447fdcf312e805d05973051e707333ab | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 19 16:56:49 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 19 16:56:49 2010 -0800 |
| tree | 9364290ead94c5bfdcec9d436a072bc729a6df07 | |
| parent | be4e1c8f6f2731e61d1c9302662892007a4579b9 [diff] | |
| parent | 716f60ce605131429dc9efe8f351f0da0c8cc8c2 [diff] |
am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp * commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2': StagefrightMediaScanner: Call endFile() for MIDI and OGG files.