summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| * | | Update for JRO03CJean-Baptiste Queru2012-07-042-6/+8
| | | | | | | | | | | | | | | | Change-Id: I3d3f3268052f87b63c258db73bcf653a23550f9c
* | | | am d309b7bd: Prepare for JellyBean AOSPJean-Baptiste Queru2012-07-043-13/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'd309b7bd1443594b8c8f6d5feea0611cb317e103': Prepare for JellyBean AOSP
| * | | Prepare for JellyBean AOSPJean-Baptiste Queru2012-07-043-13/+17
| | | | | | | | | | | | | | | | Change-Id: I7a3008cf17881550c1e1af3a8bf30816e3aa6d73
* | | | am aeccff5b: Add invensense license.Jean-Baptiste Queru2012-06-234-18/+228
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'aeccff5b16a2239963f120a894fcb904044c7a8a': Add invensense license.
| * | | Add invensense license.Jean-Baptiste Queru2012-06-234-18/+228
| | | | | | | | | | | | | | | | | | | | | | | | Minor tweaks. Change-Id: I9c8ffa2a8bc14d4ab9759220f325742323e1a8f1
* | | | Include a realistic wifi.scan mA value.Nick Pelly2012-06-111-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | With a wakelock on, and the screen off, I measured the current delta when a passive wifi scan is triggered. It is around 100mA. Bug: 6642581 Change-Id: I27f515c4a855802edcc2d80e6835481d53ea5f47
* | | am 0a30e53b: Factory images for IMM76IJean-Baptiste Queru2012-06-071-4/+5
|\ \ \ | | | | | | | | | | | | | | | | * commit '0a30e53bcd21bbb629896e48796144157296412c': Factory images for IMM76I
| * | | Factory images for IMM76IJean-Baptiste Queru2012-06-071-4/+5
| | | | | | | | | | | | | | | | Change-Id: I1c9a5dc0c436b9dc9b170fae003dee5633aa8010
| | | |
| \ \ \
*-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ \ | |/ / / _ | | | / | |_|/ |/| | Change-Id: Id7905239ca3ba6dac2b9293ac6f8f2ab16313dc8
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-04-250-0/+0
| |\ \ |/ / /
| * | merge in jb-release history after reset to masterThe Android Automerger2012-04-180-0/+0
| |\ \
| | * \ Merge commit '0b6afcb' into jb-releaseThe Android Automerger2012-04-031-88/+8
| | |\ \
| | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | |\ \ \
| | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-280-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-120-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-02-080-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-02-060-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2012-01-250-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2012-01-240-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2012-01-230-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2012-01-120-0/+0
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2012-01-100-0/+0
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2012-01-090-0/+0
| | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2012-01-040-0/+0
| | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2012-01-020-0/+0
| | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-12-290-0/+0
| | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-12-190-0/+0
| | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-12-150-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-12-140-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ merge in ics-release history after reset to masterThe Android Automerger2011-12-130-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \