summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 8ffd5f80 to jb-dev-makoJean-Baptiste Queru2012-06-261-1/+1
|\
| * Restore crespo4gJean-Baptiste Queru2012-06-251-1/+1
* | am 0f62f63f: Build libdrmdecrypt in a different environment - DO NOT MERGEJean-Baptiste Queru2012-06-261-0/+10
|\ \ | |/
| * Build libdrmdecrypt in a different environment - DO NOT MERGEJean-Baptiste Queru2012-06-251-0/+10
* | am 1dedf148: Generate output even in case of errorJean-Baptiste Queru2012-06-261-1/+11
|\ \ | |/
| * Generate output even in case of errorJean-Baptiste Queru2012-06-251-1/+11
* | am 01bbc975: (-s ours) Remove unsupported devicesJean-Baptiste Queru2012-06-150-0/+0
|\ \ | |/
| * Remove unsupported devicesJean-Baptiste Queru2012-06-151-1/+1
* | stop auto-building unsupported configsJean-Baptiste Queru2012-06-151-1/+1
* | Add makoJean-Baptiste Queru2012-06-051-1/+1
|/
* Merge "Clean up device list - do not merge" into jb-devJean-Baptiste Queru2012-04-301-1/+1
|\
| * Clean up device list - do not mergeJean-Baptiste Queru2012-04-271-1/+1
* | Allow packaging factory images from a separate bootloader fileJean-Baptiste Queru2012-04-272-2/+11
|/
* Fine-tune the generation of factory imagesJean-Baptiste Queru2012-04-192-10/+54
* resolved conflicts for merge of 447b9743 to masterJean-Baptiste Queru2012-04-121-1/+1
|\
| * am 7e33db5d: Add grouperJean-Baptiste Queru2012-04-121-1/+1
| |\
| | * Add grouperJean-Baptiste Queru2012-04-121-1/+1
* | | Remove unused NTP_SERVER.Jeff Sharkey2012-04-106-6/+0
* | | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\ \ \
| * \ \ am 7d452658: Add torospr to the list of AOSP devicesJean-Baptiste Queru2012-01-241-1/+1
| |\ \ \
| * \ \ \ am 28b7cc7e: Handle wingray and stingray separatelyJean-Baptiste Queru2011-11-091-1/+1
| |\ \ \ \
| * \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \
| | * \ \ \ \ undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | am 1fd55894: am 371b1b61: Backport from master - add crespo and stingrayJean-Baptiste Queru2011-10-260-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ am 51c52070: (-s ours) Revert "Cut support for crespo / stingray - do not merge"Jean-Baptiste Queru2011-10-240-0/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am bd147430: (-s ours) Cut support for crespo / stingray - do not mergeJean-Baptiste Queru2011-10-110-0/+0
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ am ff76bfee: am 28b6c520: Ooops, override the right variableJean-Baptiste Queru2012-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | am 28b6c520: Ooops, override the right variableJean-Baptiste Queru2012-04-021-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Ooops, override the right variableJean-Baptiste Queru2012-04-021-1/+1
* | | | | | | | | | | am 424a6240: am 36cbd9ab: Common part of the factory-image-generatorJean-Baptiste Queru2012-04-021-0/+108
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 36cbd9ab: Common part of the factory-image-generatorJean-Baptiste Queru2012-04-021-0/+108
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Common part of the factory-image-generatorJean-Baptiste Queru2012-04-021-0/+108
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | am 411fad5e: Use parallel syncs.Jean-Baptiste Queru2012-02-161-4/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Use parallel syncs.Jean-Baptiste Queru2012-02-151-4/+7
* | | | | | | | | am b55ae8e7: (-s ours) Switch to blob lists.Jean-Baptiste Queru2012-02-160-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Switch to blob lists.Jean-Baptiste Queru2012-02-152-305/+131
| |/ / / / / / /
* | | | | | | | Add mantaJean-Baptiste Queru2012-02-151-1/+1
* | | | | | | | Merge "Add torospr"Jean-Baptiste Queru2012-01-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add torosprJean-Baptiste Queru2012-01-241-1/+1
* | | | | | | | | am 7d452658: (-s ours) Add torospr to the list of AOSP devicesJean-Baptiste Queru2012-01-240-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Add torospr to the list of AOSP devicesJean-Baptiste Queru2012-01-231-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Move to plain file lists instead of complex scriptsJean-Baptiste Queru2011-12-282-311/+131
* | | | | | | Restore parts that had been deleted by accidentJean-Baptiste Queru2011-12-271-1/+5
* | | | | | | Improve self-extractor-generation scripts.Jean-Baptiste Queru2011-12-271-205/+206
* | | | | | | Merge 28b7cc7e from ics-mr1-plus-aospJean-Baptiste Queru2011-11-101-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Handle wingray and stingray separatelyJean-Baptiste Queru2011-11-091-1/+1
| |/ / / / /
* | | | | | Force sort order to 'C'Jean-Baptiste Queru2011-11-081-0/+1
| |_|_|_|/ |/| | | |
* | | | | am 371b1b61: Backport from master - add crespo and stingrayJean-Baptiste Queru2011-10-260-0/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Backport from master - add crespo and stingrayJean-Baptiste Queru2011-10-261-1/+1
| | |/ | |/|