Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk"... | Robert Shih | 2015-01-23 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1... | Robert Shih | 2015-01-23 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | | * | | | | MPEG4Extractor: more NULL derefernce fixes in parseChunk | Robert Shih | 2015-01-21 | 1 | -1/+1 | |
| | | * | | | | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-19 | 0 | -0/+0 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | do not use paused postition if it's not available | Chong Zhang | 2015-01-16 | 1 | -2/+8 | |
| | | | * | | | | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-15 | 0 | -0/+0 | |
| | | | |\ \ \ \ | ||||||
| | | | | * \ \ \ | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-14 | 0 | -0/+0 | |
| | | | | |\ \ \ \ | ||||||
| | | | | | * \ \ \ | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-12 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ | ||||||
| | | | | | | * | | | | Use aligned width and height to compute size. | Ronghua Wu | 2015-01-08 | 1 | -3/+6 | |
| | | | | | | * | | | | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-08 | 0 | -0/+0 | |
| | | | | | | |\ \ \ \ | ||||||
| | | | | | | | * \ \ \ | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-07 | 0 | -0/+0 | |
| | | | | | | | |\ \ \ \ | ||||||
* | | | | | | | | \ \ \ \ | am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files outrig... | Ronghua Wu | 2015-01-23 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am c0c2366c: Merge "stagefright: do not reject SPL4 files outright in SoftMpe... | Ronghua Wu | 2015-01-23 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" i... | Ronghua Wu | 2015-01-23 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder | Ronghua Wu | 2015-01-22 | 1 | -0/+4 | |
| | | |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | | | am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height. | Ronghua Wu | 2015-01-23 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am 841d22b0: libstagefright: Use aligned width and height. | Ronghua Wu | 2015-01-23 | 1 | -2/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | libstagefright: Use aligned width and height. | Ronghua Wu | 2015-01-22 | 1 | -2/+4 | |
* | | | | | | | | | | | | | am a789e519: am 0c4e56d0: Camera: make sure jpeg buffer size isn\'t too small | Yin-Chia Yeh | 2015-01-20 | 1 | -4/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am 0c4e56d0: Camera: make sure jpeg buffer size isn\'t too small | Yin-Chia Yeh | 2015-01-20 | 1 | -4/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Camera: make sure jpeg buffer size isn't too small | Yin-Chia Yeh | 2015-01-20 | 1 | -4/+3 | |
* | | | | | | | | | | | | | am bf2751a5: am 7ccc6b9b: Merge "fix audio patch leak." into lmp-mr1-dev | Eric Laurent | 2015-01-20 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am 7ccc6b9b: Merge "fix audio patch leak." into lmp-mr1-dev | Eric Laurent | 2015-01-20 | 1 | -2/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "fix audio patch leak." into lmp-mr1-dev | Eric Laurent | 2015-01-20 | 1 | -2/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | fix audio patch leak. | Eric Laurent | 2015-01-15 | 1 | -2/+4 | |
| | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | | am 252a9101: (-s ours) am 1ed13b3b: (-s ours) Merge "DO NOT MERGE - audio pol... | Eric Laurent | 2015-01-20 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | am 1ed13b3b: (-s ours) Merge "DO NOT MERGE - audio policy: fix output device ... | Eric Laurent | 2015-01-20 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge "DO NOT MERGE - audio policy: fix output device command after clearing ... | Eric Laurent | 2015-01-20 | 1 | -4/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | DO NOT MERGE - audio policy: fix output device command after clearing audio p... | Eric Laurent | 2015-01-20 | 1 | -4/+8 | |
| | |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | | am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ava... | Chong Zhang | 2015-01-16 | 1 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | am 4d4ea7f7: Merge "do not use paused postition if it\'s not available" into ... | Chong Zhang | 2015-01-16 | 1 | -2/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge "do not use paused postition if it's not available" into lmp-mr1-dev | Chong Zhang | 2015-01-16 | 1 | -2/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | do not use paused postition if it's not available | Chong Zhang | 2015-01-15 | 1 | -2/+8 | |
* | | | | | | | | | | | | | am 65cb339d: am 21291a42: Merge "fix leak in audio policy effect config parse... | Eric Laurent | 2015-01-15 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am 21291a42: Merge "fix leak in audio policy effect config parser" into lmp-m... | Eric Laurent | 2015-01-15 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "fix leak in audio policy effect config parser" into lmp-mr1-dev | Eric Laurent | 2015-01-15 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | fix leak in audio policy effect config parser | Eric Laurent | 2015-01-15 | 1 | -0/+4 | |
| | | | |_|_|/ / / / / / | | | |/| | | | | | | | | ||||||
* | | | | | | | | | | | | am e680491e: am 1efe46de: Merge "Fix id3 parser crash" | Marco Nelissen | 2015-01-15 | 1 | -2/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | am 1efe46de: Merge "Fix id3 parser crash" | Marco Nelissen | 2015-01-15 | 1 | -2/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge "Fix id3 parser crash" | Marco Nelissen | 2015-01-15 | 1 | -2/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | Fix id3 parser crash | Marco Nelissen | 2015-01-15 | 1 | -2/+9 | |
| | |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | | am eed5e4bd: am 5b578bec: Merge " [FM]There is no sound output from BT ear... | Leo Wang | 2015-01-15 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | am 5b578bec: Merge " [FM]There is no sound output from BT earphone while B... | Leo Wang | 2015-01-15 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge " [FM]There is no sound output from BT earphone while BT earphone is... | Leo Wang | 2015-01-15 | 1 | -4/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | [FM]There is no sound output from BT earphone while BT earphone is connected | Hochi Huang | 2015-01-13 | 1 | -4/+4 | |
| | | | |_|_|/ / / / / | | | |/| | | | | | | | ||||||
* | | | | | | | | | | | resolved conflicts for merge of 9e5929ad to lmp-mr1-dev-plus-aosp | Marco Nelissen | 2015-01-14 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 5f3194c9: MidiFile: report correct state during transient period when star... | Wei Jia | 2015-01-14 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | MidiFile: report correct state during transient period when start() is called... | Wei Jia | 2015-01-14 | 1 | -1/+1 | |
| | |/ / / / / / / / | ||||||
* | | | | | | | | | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor" | Marco Nelissen | 2015-01-13 | 19 | -942/+446 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor" | Marco Nelissen | 2015-01-13 | 19 | -942/+446 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | |