| commit | 8577676b0f9247f994ca00bc59fdbcd1318e32b6 | [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 | 8c83ce69ddc29ba46426f9bd074415a188b860bc | |
| parent | 5b12af0ea4b98ad60bc066bceb8504d16fcca41d [diff] | |
| parent | 97c9a2ec2a67969de0c5fcbcc03e9ffc8f50e807 [diff] |
am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp * commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2': StagefrightMediaScanner: Call endFile() for MIDI and OGG files.