summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 0f2c53e4 to jb-mr1-dev-plus-aospJean-Baptiste Queru2012-10-032-6/+8
|\ | | | | | | Change-Id: Ib2ccea0895a773aadc09d96cacf119d5c97eed9a
| * Distributables for JZO54K for maguroJean-Baptiste Queru2012-10-032-6/+8
| | | | | | | | Change-Id: If93b31632bec783efebcbe819cb2fc21ae2e2791
* | Merge from jb-mr1-aah-devJean-Baptiste Queru2012-09-280-0/+0
|\ \ | | | | | | | | | Change-Id: I690b2e7bf9a06fa53fd6fc922f619b6a0020d158
| * \ am 554f66f1: am a56b9f48: resolved conflicts for merge of 7464c1fa to ↵Jean-Baptiste Queru2012-09-211-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-dev-plus-aosp * commit '554f66f1e840bd2accd0d35f1f73f302c637162e': Self-extractors for JRO03R binaries for maguro
| * \ \ am 21eda0c3: (-s ours) am e189fb46: (-s ours) Reconcile with ↵The Android Open Source Project2012-09-210-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-jb-release - do not merge * commit '21eda0c31a96068540649c310850958331c258b9': Remove version requirements for AOSP
* | \ \ \ am fb853a6c: JZO54I factory image for yakjuJean-Baptiste Queru2012-09-271-3/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * commit 'fb853a6cc780dd09752029c530207b83f7e781b6': JZO54I factory image for yakju
| * | | | JZO54I factory image for yakjuJean-Baptiste Queru2012-09-271-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I21b53cf6e4b0e696209a8f9d6bca434c1b191652
* | | | | am e62b9f87: JZO54I factory images for yakjuJean-Baptiste Queru2012-09-261-3/+4
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | * commit 'e62b9f871d31f92c3b7109913d316d63c26d4745': JZO54I factory images for yakju
| * | | JZO54I factory images for yakjuJean-Baptiste Queru2012-09-261-3/+4
| | | | | | | | | | | | | | | | Change-Id: I7e9e302e4b620ce94dbcbbaade76c4e842f66b85
* | | | am a56b9f48: resolved conflicts for merge of 7464c1fa to jb-dev-plus-aospJean-Baptiste Queru2012-09-211-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * commit 'a56b9f48d6204c44383220b574fa290a9aaabb1a': Self-extractors for JRO03R binaries for maguro
| * | | resolved conflicts for merge of 7464c1fa to jb-dev-plus-aospJean-Baptiste Queru2012-09-211-0/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: If76931ca5a3046cdfebf9b4e9fcbe638691ca65b
| | * | Self-extractors for JRO03R binaries for maguroJean-Baptiste Queru2012-09-211-2/+3
| | | | | | | | | | | | | | | | Change-Id: Idf7f8fb5088b13622a312705821cc296e5393e1b
* | | | am e189fb46: (-s ours) Reconcile with stage-aosp-jb-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit 'e189fb463b42cb3fd59ffe901c1f2a0bceee827b': Remove version requirements for AOSP
| * | Reconcile with stage-aosp-jb-release - do not mergeThe Android Open Source Project2012-09-200-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: Idc715a2bf9ea404ec66e8650af77b95af37bb80d
| | * | Remove version requirements for AOSPJean-Baptiste Queru2012-09-201-5/+0
| | | | | | | | | | | | | | | | Change-Id: I9e3167c2ffa8586cf50bce47400a1b2473d005ae
* | | | auto-generated blob listJean-Baptiste Queru2012-09-201-14/+0
| | | | | | | | | | | | | | | | | | | | Bug: 4295425 Change-Id: I8e58f773668731650b11a45660f8071fe03a92ba
* | | | auto-generated blob listJean-Baptiste Queru2012-09-171-0/+8
| | | | | | | | | | | | | | | | | | | | Bug: 4295425 Change-Id: Ic19c6b97b11e5843d7584474a49cdf9be69fb5f3
* | | | Fix typoJean-Baptiste Queru2012-09-131-1/+1
| | | | | | | | | | | | | | | | Change-Id: I77a9f99be2481eb43405abf56fe6a301dfe35d49
* | | | Update self-extractors for JOO75Jean-Baptiste Queru2012-09-1310-3/+308
| | | | | | | | | | | | | | | | Change-Id: Ia48586ac1cb66bcaac9342aac2d5e6c30dfa5089
* | | | am be1d4777: Self-extractors for JZO54GJean-Baptiste Queru2012-09-131-2/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'be1d47771bd0c1ecc8191458d479c901a76004a4': Self-extractors for JZO54G
| * | | Self-extractors for JZO54GJean-Baptiste Queru2012-09-131-2/+3
| | |/ | |/| | | | | | | Change-Id: I12c8448177c0cc30d5c145f2b861be696f9b10aa
* | | auto-generated blob listJean-Baptiste Queru2012-09-071-0/+6
| | | | | | | | | | | | | | | Bug: 4295425 Change-Id: I7adeace4e62d1fb456f42f563dd34ff92a0b066a
* | | Add support for per device bluetooth configuration.Wink Saville2012-08-202-4/+26
| | | | | | | | | | | | | | | Bug: 6837125 Change-Id: Ief08fc116ab644e8c4f8668008561117b51a8956
* | | auto-generated blob listJean-Baptiste Queru2012-08-071-0/+1
| | | | | | | | | | | | | | | Bug: 4295425 Change-Id: I11ac910c5b69f3c0aa08802b875426933e4cc0e1
* | | auto-generated blob listJean-Baptiste Queru2012-08-041-0/+1
| | | | | | | | | | | | | | | Bug: 4295425 Change-Id: I8be02b19e06a46cd99fd173b5753253fbe29560e
* | | am 0d0c13d6: am 06604ad1: Binaries for JRO03HJean-Baptiste Queru2012-07-301-2/+3
|\ \ \ | |/ / | | | | | | | | | * commit '0d0c13d68821948a5bae3cf421257cefdf43e8c5': Binaries for JRO03H
| * | am 06604ad1: Binaries for JRO03HJean-Baptiste Queru2012-07-301-2/+3
| |\ \ | | | | | | | | | | | | | | | | * commit '06604ad149dcfb11134b3ddbdd6fb08d59e6e3fe': Binaries for JRO03H
| | * | Binaries for JRO03HJean-Baptiste Queru2012-07-301-2/+3
| | | | | | | | | | | | | | | | Change-Id: Ic033177a552936458376ac31c8677d37cb88dc9f
* | | | am 66c9975a: am 2d7634ec: Install fRom in the correct locationJean-Baptiste Queru2012-07-271-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '66c9975a59a5194eabf3e08b80c0220790873c1d': Install fRom in the correct location
| * | | am 2d7634ec: Install fRom in the correct locationJean-Baptiste Queru2012-07-271-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '2d7634ec8146d5df3f2c5b80a7492e544c8fbb4a': Install fRom in the correct location
| | * | Install fRom in the correct locationJean-Baptiste Queru2012-07-271-1/+1
| | | | | | | | | | | | | | | | Change-Id: If6a55560be55ad66e9866e18c585e8bd9aaeeb9b
* | | | am 1feeb7b1: Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-270-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '1feeb7b18be8e2a20510878091199b2f1ec4ccac':
| | | |
| | \ \
| *-. \ \ Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-270-0/+0
| |\ \ \ \ | | | | |/ | | | |/| | | | | | Change-Id: I07eec6cd323d5491511282a2cd0e7e80c41d513d
| | | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | | |\ \
| | * | \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | |\ \ \ \ | | | |/ / /
* | | | | | am e8b3864c: Reconcile with jb-releaseThe Android Open Source Project2012-07-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e8b3864ce3263c1eb755b3c1ddfe29546e703888': Strip board-info.txt for AOSP Update board-info.txt
| * | | | | Reconcile with jb-releaseThe Android Open Source Project2012-07-200-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I6374571053f315edf862b3c5da52e9fee3c59ce1
| | * | | | Reconcile with AOSPJean-Baptiste Queru2012-07-201-5/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I1f05fb928172179924bec3bef83d0386a47436ed
| | | * | | | Strip board-info.txt for AOSPJean-Baptiste Queru2012-07-201-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I477f3ae7a0677163766cb2129525e0227716f142
| | * | | | | Reconcile with AOSPJean-Baptiste Queru2012-07-201-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | / / | | | |_|/ / | | |/| | | Change-Id: I233fb9bdc1caa58616d304b8a6aaacb364689e5f
| | | * | | Update board-info.txtJean-Baptiste Queru2012-07-051-1/+1
| | |/ / / | | | | | | | | | | | | | | | Change-Id: I17e5b8cf0774136570601bfb2192fadded8b71ba
* | | | | am a714c73f: am ba360acf: Reconcile with AOSPJean-Baptiste Queru2012-07-201-5/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'a714c73fcf57baa103330a1bf0e09739f6d571df': Strip board-info.txt for AOSP
| * | | | am ba360acf: Reconcile with AOSPJean-Baptiste Queru2012-07-201-5/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'ba360acf428ee603fa2ebe9d13a970ad73b327ae': Strip board-info.txt for AOSP
| | * | | Reconcile with AOSPJean-Baptiste Queru2012-07-201-5/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ie9453a953131b58d303c567493915cb98b652a58
| | | * | | Strip board-info.txt for AOSPJean-Baptiste Queru2012-07-201-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5948210c1a1428ed9cb4f8a8319bfe43e0f76a44
* | | | | | am bc9c0619: am de8b6a5d: Reconcile with AOSPJean-Baptiste Queru2012-07-200-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'bc9c061909b89893d98b0c1f7cd9fa4971279b20': Update board-info.txt
| * | | | | am de8b6a5d: Reconcile with AOSPJean-Baptiste Queru2012-07-200-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | * commit 'de8b6a5d99da277edf17b741805cc2992f940ab9': Update board-info.txt
| | * | | Reconcile with AOSPJean-Baptiste Queru2012-07-201-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | Change-Id: I147da3a9ba69aad6402b4c40615ab7b871e78c95
| | | * | Update board-info.txtJean-Baptiste Queru2012-07-051-1/+1
| | |/ / | | | | | | | | | | | | Change-Id: Ia4d644b77a7617a608503d40362143d96f8ae891
* | | | am d14174a5: Update for JRO03CJean-Baptiste Queru2012-07-042-6/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd14174a56c6099f32adbfa11a2fdba4580c7ff96': Update for JRO03C