summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 61126f3c to masterJean-Baptiste Queru2012-03-281-2/+14
|\
| * am 8d3fceb7: organize scripts with per-version sections to avoid merge conflictsJean-Baptiste Queru2012-03-281-2/+7
| |\
| | * organize scripts with per-version sections to avoid merge conflictsJean-Baptiste Queru2012-03-281-2/+7
* | | Updated copyright/license for broadcomJean-Baptiste Queru2012-03-282-2/+219
* | | resolved conflicts for merge of 87f8d661 to masterJean-Baptiste Queru2012-03-282-17/+75
|\ \ \ | |/ /
| * | resolved conflicts for merge of 0c5d1eba to ics-scoop-plus-aospJean-Baptiste Queru2012-03-282-19/+77
| |\ \ | | |/
| | * Update extractor scripts to IMM76DJean-Baptiste Queru2012-03-273-21/+79
* | | require bootloader PRIMELC03Ed Heyl2012-03-271-1/+1
* | | Merge "move hardware feature definitions"Colin Cross2012-03-271-1/+1
|\ \ \
| * | | move hardware feature definitionsColin Cross2012-03-261-1/+1
* | | | am de70238d: (-s ours) am 9c33a4ca: Add broadcom license. Go back to IML74K.Jean-Baptiste Queru2012-03-270-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am 9c33a4ca: Add broadcom license. Go back to IML74K.Jean-Baptiste Queru2012-03-263-4/+221
| |\ \ | | |/
| | * Add broadcom license. Go back to IML74K.Jean-Baptiste Queru2012-03-263-4/+221
* | | Remove Camera package (it's merged into Gallery package).Chih-Chung Chang2012-03-081-4/+0
* | | require bootloader PRIMELB02Ed Heyl2012-03-051-1/+1
* | | am 7b999cc6: (-s ours) am 748cf6e9: auto-generated blob listJean-Baptiste Queru2012-02-160-0/+0
|\ \ \ | |/ /
| * | am 748cf6e9: auto-generated blob listJean-Baptiste Queru2012-02-161-0/+38
| |\ \
| | * | auto-generated blob listJean-Baptiste Queru2012-02-161-0/+38
* | | | am 2bb389cd: am cec5432b: Remove old-style blobs handlersJean-Baptiste Queru2012-02-160-0/+0
|\ \ \ \ | |/ / /
| * | | am cec5432b: Remove old-style blobs handlersJean-Baptiste Queru2012-02-153-300/+0
| |\ \ \ | | |/ /
| | * | Remove old-style blobs handlersJean-Baptiste Queru2012-02-153-300/+0
* | | | am 1c44b646: (-s ours) am 15bdcaef: Restrict the list of acceptable prerequis...Jean-Baptiste Queru2012-02-160-0/+0
|\ \ \ \ | |/ / /
| * | | am 15bdcaef: Restrict the list of acceptable prerequisitesJean-Baptiste Queru2012-02-151-2/+2
| |\ \ \ | | |/ /
| | * | Restrict the list of acceptable prerequisitesJean-Baptiste Queru2012-02-031-2/+2
* | | | Merge 0826c498Jean-Baptiste Queru2012-02-071-0/+1
|\ \ \ \ | |/ / /
| * | | am 423cd877: Self-extractors for IMM30DJean-Baptiste Queru2012-02-071-2/+3
| |\ \ \ | | | |/ | | |/|
| | * | Self-extractors for IMM30DJean-Baptiste Queru2012-02-071-2/+3
* | | | Merge 36a79943Jean-Baptiste Queru2012-02-031-0/+1
|\ \ \ \ | |/ / /
| * | | am b2fba582: Self-extractors for imm30bJean-Baptiste Queru2012-02-031-2/+3
| |\ \ \ | | |/ /
| | * | Self-extractors for imm30bJean-Baptiste Queru2012-02-021-2/+3
* | | | am 1ad9ac15: am 91643fd9: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ | |/ / /
| * | | am 91643fd9: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ | | |/ / | |/| / | | |/
| | * Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\
* | | \ am 128bcc34: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-300-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-300-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-250-0/+0
| | |\ \ | | | |/ | | |/|
* | | | am f5a249ce: (-s ours) am 8d9e000f: require bootloader LA03Ed Heyl2012-01-250-0/+0
|\ \ \ \ | |/ / /
| * | | am 8d9e000f: require bootloader LA03Ed Heyl2012-01-251-1/+1
| |\ \ \ | | |/ /
| | * | require bootloader LA03Ed Heyl2012-01-251-1/+1
* | | | require bootloader LA03Ed Heyl2012-01-241-1/+1
* | | | Merge "pvrsrvinit -> pvrsrvctl"Jean-Baptiste Queru2012-01-233-4/+4
|\ \ \ \
| * | | | pvrsrvinit -> pvrsrvctlJean-Baptiste Queru2012-01-233-4/+4
* | | | | Merge "auto-generated blob list"Jean-Baptiste Queru2012-01-231-1/+1
|\ \ \ \ \
| * | | | | auto-generated blob listJean-Baptiste Queru2012-01-201-1/+1
| |/ / / /
* | | | | am 3f1c740e: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-200-0/+0
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-190-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-180-0/+0
| | |\ \ | | | |/ | | |/|
* | | | split board-info.txt into AOSP and non-AOSP versionsDoug Zongker2012-01-192-0/+8
* | | | Merge commit '7c847c4e' into fix-merge-conflictWink Saville2012-01-191-1/+1
|\ \ \ \ | |/ / /
| * | | am 6a793005: Update board-info.txt for new radio.I9250XXLA2Wink Saville2012-01-181-1/+1
| |\ \ \ | | |/ /