summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | am 01bbc975: (-s ours) Remove unsupported devicesJean-Baptiste Queru2012-06-150-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01bbc9753f32ee795965dda181c98b80ad6ef068': Remove unsupported devices
| * | | | | | stop auto-building unsupported configsJean-Baptiste Queru2012-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieef24158c8d6efd6203cdef265834a3d812b14b0
| * | | | | | Add makoJean-Baptiste Queru2012-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0e50d6cef17134800e07a4f0ae94954b70f8e08
* | | | | | | Support https-based GerritJean-Baptiste Queru2012-07-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6d0733836f7a8c7db38d65fb0673efa4f148a4d7
* | | | | | | am ed512b8f: (-s ours) Add toroJean-Baptiste Queru2012-07-040-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | * commit 'ed512b8f2d08cf81bc987b8f5f257393ea007afc': Add toro
| * | | | | | Add toroJean-Baptiste Queru2012-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ccd62a3edbcae6b23ce2fe652ec565ec9c7a6ec
* | | | | | | Add toroJean-Baptiste Queru2012-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ccd62a3edbcae6b23ce2fe652ec565ec9c7a6ec
* | | | | | | resolved conflicts for merge of 479368b4 to masterJean-Baptiste Queru2012-06-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: Ie000624d9b3f194d47fc506347c4e4ad5b19101b
| * | | | | | am 8ffd5f80: Restore crespo4gJean-Baptiste Queru2012-06-261-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | * commit '8ffd5f8087a380e1daa9000a12908f83d376a6da': Restore crespo4g
| | * | | | | Restore crespo4gJean-Baptiste Queru2012-06-251-1/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Bug: 4295425 Change-Id: Ie9580a43749cafa580668b3c34a7fd0a28eb80d0
* | | | | | am 4895b6f5: (-s ours) am 0f62f63f: Build libdrmdecrypt in a different ↵Jean-Baptiste Queru2012-06-260-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | environment - DO NOT MERGE * commit '4895b6f540cc0c6d1111c48833999dd0624ccf2b': Build libdrmdecrypt in a different environment - DO NOT MERGE
| * | | | | am 0f62f63f: Build libdrmdecrypt in a different environment - DO NOT MERGEJean-Baptiste Queru2012-06-261-0/+10
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '0f62f63f115007540b30176e225bf3ec58f1ae64': Build libdrmdecrypt in a different environment - DO NOT MERGE
| | * | | | Build libdrmdecrypt in a different environment - DO NOT MERGEJean-Baptiste Queru2012-06-251-0/+10
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: 4295425 Change-Id: If483e5a72aa3e37d4faa46c28f5c170deb647996
* | | | | am ece4e652: am 1dedf148: Generate output even in case of errorJean-Baptiste Queru2012-06-261-1/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ece4e65299eb1fbf15b0cc30cba6eadd6798569b': Generate output even in case of error
| * | | | am 1dedf148: Generate output even in case of errorJean-Baptiste Queru2012-06-261-1/+11
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '1dedf148fe8f7bf7a2e841b8a17e929f5802c2b7': Generate output even in case of error
| | * | | Generate output even in case of errorJean-Baptiste Queru2012-06-251-1/+11
| | | |/ | | |/| | | | | | | | | | | | | Bug: 4295425 Change-Id: Iab20687a11a585fde20714c807df8bc8145e9ddf
* | | | am 9ceee561: Factory images: erase all partitions.Jean-Baptiste Queru2012-06-262-0/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '9ceee5613b0474e97d0992550344ac02143206fa': Factory images: erase all partitions.
| * | | Factory images: erase all partitions.Jean-Baptiste Queru2012-06-262-0/+15
| |/ / | | | | | | | | | Change-Id: Iaa3248fabeaf976060c4c512c862cb88aae5c26d
* | | am 01bbc975: (-s ours) Remove unsupported devicesJean-Baptiste Queru2012-06-150-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '01bbc9753f32ee795965dda181c98b80ad6ef068': Remove unsupported devices
| * | Remove unsupported devicesJean-Baptiste Queru2012-06-151-1/+1
| |/ | | | | | | Change-Id: Id8c8449a243e5a1eb0c20f2dd50d74b022e0c4a2
* | stop auto-building unsupported configsJean-Baptiste Queru2012-06-151-1/+1
| | | | | | | | Change-Id: If549471a96efe55e0da1ae76fe4a608dbd442709
* | am 6f277ef6: (-s ours) Merge "Clean up device list - do not merge" into jb-devJean-Baptiste Queru2012-04-300-0/+0
|\ \ | |/ | | | | | | * commit '6f277ef64ecd17bf0d5e82a1698bbfb0afb3ffd2': Clean up device list - do not merge
| * 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
| | | | | | | | Change-Id: Ib6b4bb49b7658370cff64124731bb0a06a116c44
* | Allow packaging factory images from a separate bootloader fileJean-Baptiste Queru2012-04-272-2/+11
|/ | | | Change-Id: Iffdf98cb424b4f7e82cd231395d736e572ae453d
* Fine-tune the generation of factory imagesJean-Baptiste Queru2012-04-192-10/+54
| | | | Change-Id: I574bdab542a30931016db532e529386b4e4ef0d1
* resolved conflicts for merge of 447b9743 to masterJean-Baptiste Queru2012-04-121-1/+1
|\ | | | | | | Change-Id: Iffc8b1a0e373d5819948053610ac0b346f096172
| * am 7e33db5d: Add grouperJean-Baptiste Queru2012-04-121-1/+1
| |\ | | | | | | | | | | | | * commit '7e33db5d5e7a095574a4bcddc03b143a2c0f4f87': Add grouper
| | * Add grouperJean-Baptiste Queru2012-04-121-1/+1
| | | | | | | | | | | | Change-Id: Id179f6f4e9c75220dcbd21177a2905c790491db6
* | | Remove unused NTP_SERVER.Jeff Sharkey2012-04-106-6/+0
| | | | | | | | | | | | | | | | | | Platform now uses Settings.Secure.NTP_SERVER. Change-Id: Ib45cc41c2a7570715835a95fc9ebb179b048fefd
* | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '7d4526582f88808a3194e1a3b304abb369d2745c': Add torospr to the list of AOSP devices
| * \ \ \ am 28b7cc7e: Handle wingray and stingray separatelyJean-Baptiste Queru2011-11-091-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '28b7cc7e41f9521a2e9e3b197ed2f750acc4cc15': Handle wingray and stingray separately
| * \ \ \ \ 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
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1fd558942fba95e04c158392ebc6e2d597e433cb': Backport from master - add crespo and stingray
| | * \ \ \ \ \ am 51c52070: (-s ours) Revert "Cut support for crespo / stingray - do not merge"Jean-Baptiste Queru2011-10-240-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '51c52070eeaaf6d40cdc8322aa6f9be4e9f23887': Revert "Cut support for crespo / stingray - do not merge"
| | * \ \ \ \ \ \ am bd147430: (-s ours) Cut support for crespo / stingray - do not mergeJean-Baptiste Queru2011-10-110-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bd147430f139105e1f6e15a50e8d0b18876d9905': Cut support for crespo / stingray - do not merge
* | | \ \ \ \ \ \ \ am ff76bfee: am 28b6c520: Ooops, override the right variableJean-Baptiste Queru2012-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff76bfeec857c4732c39972d34caf23c1d37ae26': Ooops, override the right variable
| * | | | | | | | | am 28b6c520: Ooops, override the right variableJean-Baptiste Queru2012-04-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '28b6c520098c903839d2a98c3ab460cbaced371f': Ooops, override the right variable
| | * | | | | | | | | Ooops, override the right variableJean-Baptiste Queru2012-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6a43176211326364562e69a6a32f9156495e7a82
* | | | | | | | | | | am 424a6240: am 36cbd9ab: Common part of the factory-image-generatorJean-Baptiste Queru2012-04-021-0/+108
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '424a6240b43d283109f07f8094cd8ab1f810c9dd': Common part of the factory-image-generator
| * | | | | | | | | | am 36cbd9ab: Common part of the factory-image-generatorJean-Baptiste Queru2012-04-021-0/+108
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | * commit '36cbd9ab6f83166ad36214d077684a0e53dc6b13': Common part of the factory-image-generator
| | * | | | | | | | Common part of the factory-image-generatorJean-Baptiste Queru2012-04-021-0/+108
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie4b68a0a61c5ec4d1cd617f0786ad7e8f06283d6
* | | | | | | | | am 411fad5e: Use parallel syncs.Jean-Baptiste Queru2012-02-161-4/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '411fad5eb73a21a691bcfd876afd5143983fab27': Use parallel syncs.
| * | | | | | | | Use parallel syncs.Jean-Baptiste Queru2012-02-151-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, wait until syncing is done to write the tree. Also, only delete the out tree. Change-Id: I7d6c144c8ea5a702b74c827dd5879107baa4c145
* | | | | | | | | am b55ae8e7: (-s ours) Switch to blob lists.Jean-Baptiste Queru2012-02-160-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b55ae8e7a2f902030fe24a6d91ec0465000762a8': Switch to blob lists.
| * | | | | | | | Switch to blob lists.Jean-Baptiste Queru2012-02-152-305/+131
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're easier to handle and less confusing than scripts. Change-Id: I094ca9c260d2761d366831bea2573b0cb3cfae9d
* | | | | | | | Add mantaJean-Baptiste Queru2012-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I639458be4fcbd2d3d916b55e111e0191982ece4f