summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe:...Abhishek Arya2015-08-201-2/+3
|\
| * am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8:...Abhishek Arya2015-08-201-2/+3
| |\
| | * am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check...Abhishek Arya2015-08-201-2/+3
| | |\
| | | * am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload...Abhishek Arya2015-08-201-2/+3
| | | |\
| | | | * am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into...Abhishek Arya2015-08-201-2/+3
| | | | |\
| | | | | * am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| | | | | |\
| | | | | | * am 635d38a8: Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| | | | | | |\
| | | | | | | * Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| | | | | | | |\
| | | | | | | | * Check RTSP payload lengthMarco Nelissen2015-08-191-2/+3
* | | | | | | | | am b49b1af0: am f526f687: am a07ad890: am 776bfd80: am 8a55bcb6: resolved con...Marco Nelissen2015-08-200-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am f526f687: am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for me...Marco Nelissen2015-08-201-0/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd...Marco Nelissen2015-08-201-0/+7
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-devMarco Nelissen2015-08-201-0/+7
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-devMarco Nelissen2015-08-201-0/+7
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | resolved conflicts for merge of ced2dd3c to lmp-devMarco Nelissen2015-08-201-0/+7
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | | * | | am 2c880dde: Merge "Sanity check padding/delay values for gapless playback" i...Abhishek Arya2015-08-201-0/+7
| | | | | | |\ \ \ | | | | | | | |/ /
| | | | | | | * | Merge "Sanity check padding/delay values for gapless playback" into klp-devAbhishek Arya2015-08-201-0/+7
| | | | | | | |\ \
| | | | | | | | * | Sanity check padding/delay values for gapless playbackMarco Nelissen2015-08-181-0/+7
| | | | | | | | |/
* | | | | | | | | am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca:...Wei Jia2015-08-201-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit...Wei Jia2015-08-201-1/+19
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\'...Wei Jia2015-08-201-1/+19
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEADWei Jia2015-08-201-1/+19
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEADWei Jia2015-08-201-1/+19
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | am a590baca: Merge commit \'6ae815e0\' into HEADWei Jia2015-08-201-1/+19
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | | * | | Merge commit '6ae815e0' into HEADWei Jia2015-08-201-1/+19
| | | | | | |\ \ \ | | | | | | | |/ /
| | | | | | | * | Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInfor...Wei Jia2015-08-201-1/+19
| | | | | | | |\ \
| | | | | | | | * | libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationO...Wei Jia2015-08-201-1/+19
* | | | | | | | | | am 7c6a8141: am e4bcb3f8: am 238a487a: am e3cb2507: am 4b995f73: Merge "libst...Wei Jia2015-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am e4bcb3f8: am 238a487a: am e3cb2507: am 4b995f73: Merge "libstagefright: fi...Wei Jia2015-08-202-3/+16
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 238a487a: am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of...Wei Jia2015-08-202-3/+16
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeE...Wei Jia2015-08-202-3/+16
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mN...Wei Jia2015-08-202-3/+16
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes...Wei Jia2015-08-202-3/+16
| | | | | |\ \ \ \ \
| | | | | | * | | | | libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in Sam...Wei Jia2015-08-192-3/+16
* | | | | | | | | | | am 34272233: am 3dcb448f: am 4bb01def: am 84a4221e: am a9b3cd3c: am 5221133b:...Wei Jia2015-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 3dcb448f: am 4bb01def: am 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351:...Wei Jia2015-08-201-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 4bb01def: am 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351: libstagefrig...Wei Jia2015-08-201-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overf...Wei Jia2015-08-201-2/+2
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_...Wei Jia2015-08-201-2/+2
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| / / / / | | | | | | |/ / / /
| | | | | | * | | | am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
| | | | | | | |/ /
* | | | | | | | | am dbdcecd6: (-s ours) am 8df49713: am 603d35e1: am 096a931e: am fd5942b3: am...Eric Laurent2015-08-200-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 8df49713: am 603d35e1: am 096a931e: am fd5942b3: am 6b52d191: (-s ours) am...Eric Laurent2015-08-200-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 603d35e1: am 096a931e: am fd5942b3: am 6b52d191: (-s ours) am 916a9684: Me...Eric Laurent2015-08-190-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 096a931e: am fd5942b3: am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT M...Eric Laurent2015-08-190-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | am fd5942b3: am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE - audio ...Eric Laurent2015-08-180-0/+0
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | am 6b52d191: (-s ours) am 916a9684: Merge "DO NOT MERGE - audio flinger: fix ...Eric Laurent2015-08-180-0/+0
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | | * | | am 916a9684: Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into k...Eric Laurent2015-08-183-6/+21
| | | | | | |\ \ \ | | | | | | | |/ /
| | | | | | | * | Merge "DO NOT MERGE - audio flinger: fix fuzz test crash" into klp-devEric Laurent2015-08-183-6/+21
| | | | | | | |\ \