summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 65cb339d: am 21291a42: Merge "fix leak in audio policy effect config parse...Eric Laurent2015-01-151-0/+4
|\
| * am 21291a42: Merge "fix leak in audio policy effect config parser" into lmp-m...Eric Laurent2015-01-151-0/+4
| |\
| | * Merge "fix leak in audio policy effect config parser" into lmp-mr1-devEric Laurent2015-01-151-0/+4
| | |\
| | | * fix leak in audio policy effect config parserEric Laurent2015-01-151-0/+4
* | | | am e680491e: am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
|\ \ \ \
| * \ \ \ am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| |\ \ \ \
| | * \ \ \ Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| | |\ \ \ \
| | | * | | | Fix id3 parser crashMarco Nelissen2015-01-151-2/+9
| | |/ / / /
* | | | | | am eed5e4bd: am 5b578bec: Merge " [FM]There is no sound output from BT ear...Leo Wang2015-01-151-4/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 5b578bec: Merge " [FM]There is no sound output from BT earphone while B...Leo Wang2015-01-151-4/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge " [FM]There is no sound output from BT earphone while BT earphone is...Leo Wang2015-01-151-4/+4
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | [FM]There is no sound output from BT earphone while BT earphone is connectedHochi Huang2015-01-131-4/+4
* | | | | | resolved conflicts for merge of 9e5929ad to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-140-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5f3194c9: MidiFile: report correct state during transient period when star...Wei Jia2015-01-141-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | MidiFile: report correct state during transient period when start() is called...Wei Jia2015-01-141-1/+1
| | |/ / /
* | | | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1319-942/+446
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1319-942/+446
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1319-942/+446
| | |\ \ \
| | | * | | Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-0819-942/+446
* | | | | | am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" in...Rachad2015-01-104-0/+71
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-devRachad2015-01-104-0/+71
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-devRachad2015-01-104-0/+71
| | |\ \ \ \
| | | * | | | ACodec: Added support for E-AC3 decodersRachad2014-12-234-0/+71
* | | | | | | am d8ba6ef1: am 38a97bd7: stagefright: keep alignment restrictions for SoftVi...Lajos Molnar2015-01-101-21/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 38a97bd7: stagefright: keep alignment restrictions for SoftVideoDecoderLajos Molnar2015-01-101-21/+14
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | stagefright: keep alignment restrictions for SoftVideoDecoderLajos Molnar2015-01-091-21/+14
* | | | | | | am 43799d70: am a2d2c48a: Merge "Don\'t signal an error at the end of a short...Marco Nelissen2015-01-090-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am a2d2c48a: Merge "Don\'t signal an error at the end of a short file"Marco Nelissen2015-01-091-19/+11
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Don't signal an error at the end of a short file"Marco Nelissen2015-01-091-19/+11
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Don't signal an error at the end of a short fileMarco Nelissen2014-12-231-19/+11
* | | | | | | am d18196a1: am c8c68c88: Merge "Use aligned width and height to compute size...Ronghua Wu2015-01-081-3/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am c8c68c88: Merge "Use aligned width and height to compute size." into lmp-m...Ronghua Wu2015-01-081-3/+6
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Use aligned width and height to compute size." into lmp-mr1-devRonghua Wu2015-01-081-3/+6
| | |\ \ \ \ \
| | | * | | | | Use aligned width and height to compute size.Ronghua Wu2015-01-071-3/+6
| | | | |_|_|/ | | | |/| | |
* | | | | | | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-089-64/+145
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am c52af00b: Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-089-64/+147
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-089-64/+147
| | |\ \ \ \ \
| | | * | | | | Use callbacks for Midi I/OMarco Nelissen2015-01-089-64/+147
| | |/ / / / /
* | | | | | | am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to...Chong Zhang2015-01-085-1/+19
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 468977f0: Merge "mark any copyrighted content as protected to disable capt...Chong Zhang2015-01-085-1/+19
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "mark any copyrighted content as protected to disable capture" into lmp...Chong Zhang2015-01-085-1/+19
| | |\ \ \ \ \
| | | * | | | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-075-1/+19
* | | | | | | | am 78c02ddb: am cfa5bf04: Merge "make libserviceutility a shared lib" into lm...Chong Zhang2015-01-073-10/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am cfa5bf04: Merge "make libserviceutility a shared lib" into lmp-mr1-devChong Zhang2015-01-073-10/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "make libserviceutility a shared lib" into lmp-mr1-devChong Zhang2015-01-073-10/+14
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | make libserviceutility a shared libChong Zhang2015-01-073-10/+14
| | | * | | | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-060-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-230-0/+0
| | | | |\ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |
| | | | | * | | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-220-0/+0
| | | | | |\ \ \ \
| | | | | | * | | | audio policy: fix remote mic captureEric Laurent2014-12-142-17/+43
generated by cgit v1.1 at 2025-01-09 03:23:33 +0000