| commit | 9b99eb350e6b5cfaa0acb94f0f81da904e9d0987 | [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 | 2ec012fa06311ad0e6b94c9161848be293a3a0fe | |
| parent | 6bca1b0809f8a415469317e62b95b8338377103c [diff] | |
| parent | f863896d52c6006e79e9f5fcc406bc12f2239fae [diff] |
am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp * commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2': StagefrightMediaScanner: Call endFile() for MIDI and OGG files.