summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | am 588d7b8d: am 1c12b44c: (-s ours) am e9b4f50e: am 386c576a: am e534b0e8: am...Marco Nelissen2015-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 1c12b44c: (-s ours) am e9b4f50e: am 386c576a: am e534b0e8: am 00880781: am...Marco Nelissen2015-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am e9b4f50e: am 386c576a: am e534b0e8: am 00880781: am f839b2a3: (-s ours) am...Marco Nelissen2015-08-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 386c576a: am e534b0e8: am 00880781: am f839b2a3: (-s ours) am 5aa887ef: am...Marco Nelissen2015-08-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am e534b0e8: am 00880781: am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-...Marco Nelissen2015-08-200-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | am 00880781: am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) am 18...Marco Nelissen2015-08-200-0/+0
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da...Marco Nelissen2015-08-200-0/+0
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | |/| / / / / | | | | | | | |/ / / /
| | | | | | | * | | | am 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 60...Marco Nelissen2015-08-200-0/+0
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b2...Marco Nelissen2015-08-200-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am...Marco Nelissen2015-08-200-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am...Marco Nelissen2015-08-200-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07:...Marco Nelissen2015-08-201-6/+16
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * \ \ am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE...Marco Nelissen2015-08-201-6/+16
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | * \ \ am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gr...Marco Nelissen2015-08-201-6/+16
| | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | * \ \ am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on a...Marco Nelissen2015-08-201-6/+16
| | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | * \ \ am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation fai...Marco Nelissen2015-08-201-6/+16
| | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | * \ \ am ce73af07: DO NOT MERGE Fail more gracefully on allocation failureMarco Nelissen2015-08-201-6/+16
| | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | * | | DO NOT MERGE Fail more gracefully on allocation failureMarco Nelissen2015-08-201-6/+16
* | | | | | | | | | | | | | | | | | | | am efbc1bc8: am 32fe0815: am c663f602: am c03cf67e: am a3cc3272: am d4f0d88e:...Marco Nelissen2015-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 32fe0815: am c663f602: am c03cf67e: am a3cc3272: am d4f0d88e: resolved con...Marco Nelissen2015-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am c663f602: am c03cf67e: am a3cc3272: am d4f0d88e: resolved conflicts for me...Marco Nelissen2015-08-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | am c03cf67e: am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10cc...Marco Nelissen2015-08-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-devMarco Nelissen2015-08-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-devMarco Nelissen2015-08-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | resolved conflicts for merge of eb10ccbc to lmp-devMarco Nelissen2015-08-200-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / /
| | | | | | | * | | | | | | | | | | | | resolved conflicts for merge of 8a064aa8 to klp-modular-devMarco Nelissen2015-08-201-7/+19
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / /
| | | | | | | | * | | | | | | | | | | | Merge "Fail more gracefully on allocation failure" into klp-devMarco Nelissen2015-08-201-7/+20
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | | | | | Fail more gracefully on allocation failureMarco Nelissen2015-08-191-7/+20
* | | | | | | | | | | | | | | | | | | | | am 7a4cfed7: am 49cfd200: am 35fbcdd6: am 3d97de8c: am b8a84e59: am ef87594b:...Nick Kralevich2015-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am 49cfd200: am 35fbcdd6: am 3d97de8c: am b8a84e59: am ef87594b: Merge "libst...Nick Kralevich2015-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | am 35fbcdd6: am 3d97de8c: am b8a84e59: am ef87594b: Merge "libstagefright: Fi...Nick Kralevich2015-08-201-22/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | am 3d97de8c: am b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in co...Nick Kralevich2015-08-201-22/+66
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | am b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in convertMetaData...Nick Kralevich2015-08-201-22/+66
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" in...Nick Kralevich2015-08-201-22/+66
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-devNick Kralevich2015-08-201-22/+66
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | | libstagefright: Fix crash in convertMetaDataToMessageWei Jia2015-08-191-22/+66
* | | | | | | | | | | | | | | | | | | | | | am 01afbf07: am fbac8266: am a205e4ae: am 9b6d2426: am bd96da22: am b53cdf49:...Wei Jia2015-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am fbac8266: am a205e4ae: am 9b6d2426: am bd96da22: am b53cdf49: am d7c205fe:...Wei Jia2015-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | am a205e4ae: am 9b6d2426: am bd96da22: am b53cdf49: am d7c205fe: am 522019f1:...Wei Jia2015-08-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | am 9b6d2426: am bd96da22: am b53cdf49: am d7c205fe: am 522019f1: Merge "libst...Wei Jia2015-08-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | am bd96da22: am b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fi...Wei Jia2015-08-200-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | am b53cdf49: am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of...Wei Jia2015-08-200-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | am d7c205fe: am 522019f1: Merge "libstagefright: fix handling of mSampleTimeE...Wei Jia2015-08-200-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mN...Wei Jia2015-08-201-1/+13
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / / | | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes...Wei Jia2015-08-201-1/+13
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | | | | | | | libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in Sam...Wei Jia2015-08-191-1/+13
| | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | | | | | | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | am fb5c8f44: am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3:...Abhishek Arya2015-08-201-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / /