summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-269-16/+7
|\
| * am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-269-16/+7
| |\
| | * Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-269-16/+7
| | |\
| | | * Remove superfluous OpenSSL include paths.Adam Langley2015-01-229-16/+7
| | |/
* | | am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-devMarco Nelissen2015-01-231-2/+2
|\ \ \
| * \ \ am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-devMarco Nelissen2015-01-231-2/+2
| |\ \ \
| | * \ \ Merge "Fix MTP delete" into lmp-mr1-devMarco Nelissen2015-01-231-2/+2
| | |\ \ \
| | | * | | Fix MTP deleteMarco Nelissen2015-01-231-2/+2
* | | | | | am d8aff827: am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes i...Robert Shih2015-01-231-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk"...Robert Shih2015-01-231-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1...Robert Shih2015-01-231-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | MPEG4Extractor: more NULL derefernce fixes in parseChunkRobert Shih2015-01-211-1/+1
| | | * | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-190-0/+0
| | | |\ \ \
| | | | * | | do not use paused postition if it's not availableChong Zhang2015-01-161-2/+8
| | | | * | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-150-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-140-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-120-0/+0
| | | | | | |\ \ \
| | | | | | | * | | Use aligned width and height to compute size.Ronghua Wu2015-01-081-3/+6
| | | | | | | * | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-080-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-070-0/+0
| | | | | | | | |\ \ \
* | | | | | | | | \ \ \ am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files outrig...Ronghua Wu2015-01-231-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am c0c2366c: Merge "stagefright: do not reject SPL4 files outright in SoftMpe...Ronghua Wu2015-01-231-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" i...Ronghua Wu2015-01-231-0/+4
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | stagefright: do not reject SPL4 files outright in SoftMpeg4 decoderRonghua Wu2015-01-221-0/+4
| | | |/ / / / / / / / /
* | | | | | | | | | | | am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height.Ronghua Wu2015-01-231-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 841d22b0: libstagefright: Use aligned width and height.Ronghua Wu2015-01-231-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | libstagefright: Use aligned width and height.Ronghua Wu2015-01-221-2/+4
* | | | | | | | | | | | am a789e519: am 0c4e56d0: Camera: make sure jpeg buffer size isn\'t too smallYin-Chia Yeh2015-01-201-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 0c4e56d0: Camera: make sure jpeg buffer size isn\'t too smallYin-Chia Yeh2015-01-201-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Camera: make sure jpeg buffer size isn't too smallYin-Chia Yeh2015-01-201-4/+3
* | | | | | | | | | | | am bf2751a5: am 7ccc6b9b: Merge "fix audio patch leak." into lmp-mr1-devEric Laurent2015-01-201-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 7ccc6b9b: Merge "fix audio patch leak." into lmp-mr1-devEric Laurent2015-01-201-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "fix audio patch leak." into lmp-mr1-devEric Laurent2015-01-201-2/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | fix audio patch leak.Eric Laurent2015-01-151-2/+4
| | | | |/ / / / / / / | | | |/| | | | | | |
* | | | | | | | | | | am 252a9101: (-s ours) am 1ed13b3b: (-s ours) Merge "DO NOT MERGE - audio pol...Eric Laurent2015-01-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | am 1ed13b3b: (-s ours) Merge "DO NOT MERGE - audio policy: fix output device ...Eric Laurent2015-01-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Merge "DO NOT MERGE - audio policy: fix output device command after clearing ...Eric Laurent2015-01-201-4/+8
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | DO NOT MERGE - audio policy: fix output device command after clearing audio p...Eric Laurent2015-01-201-4/+8
| | |/ / / / / / / / /
* | | | | | | | | | | am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ava...Chong Zhang2015-01-161-2/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 4d4ea7f7: Merge "do not use paused postition if it\'s not available" into ...Chong Zhang2015-01-161-2/+8
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "do not use paused postition if it's not available" into lmp-mr1-devChong Zhang2015-01-161-2/+8
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | do not use paused postition if it's not availableChong Zhang2015-01-151-2/+8
* | | | | | | | | | | | 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
| | |/ / / / / / / / /