summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 4a7ec0f3: am 8efbf9e5: (-s ours) am 53e16ebc: (-s ours) Reconcile with jb-...Jean-Baptiste Queru2013-03-110-0/+0
|\
| * am 8efbf9e5: (-s ours) am 53e16ebc: (-s ours) Reconcile with jb-mr1-release -...Jean-Baptiste Queru2013-03-110-0/+0
| |\
| | * am 53e16ebc: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | |\ | |/ /
| | * Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | |\
* | | \ am c262ac6b: tuna: prebuilt kernel (security fix)Todd Poynor2012-11-280-0/+0
|\ \ \ \ | |/ / /
| * | | tuna: prebuilt kernel (security fix)Todd Poynor2012-11-280-0/+0
* | | | am f63838de: new kernel prebuiltErik Gilling2012-11-270-0/+0
|\ \ \ \ | |/ / /
| * | | new kernel prebuiltErik Gilling2012-11-260-0/+0
* | | | am a0665814: [tuna] GPS: Fix security holeSangcheol Lee2012-11-261-0/+2
|\ \ \ \ | |/ / /
| * | | [tuna] GPS: Fix security holeSangcheol Lee2012-11-201-0/+2
* | | | am 29dda139: tuna: kernel prebuiltDmitry Shmidt2012-11-160-0/+0
|\ \ \ \ | |/ / /
| * | | tuna: kernel prebuiltDmitry Shmidt2012-11-160-0/+0
* | | | am 2b60db0e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \ \ \ | |/ / /
| | | |
| | \ \
| *-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/
| | | * tuna: prebuilt kernel (wifi wakelock revert, uname security fix)Todd Poynor2012-11-020-0/+0
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-250-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| | | | |\ | | | |_|/ | | |/| |
| | * | | Revert "Remove the Google specific location config."Jeff Hamilton2012-10-051-0/+4
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-050-0/+0
| | |\ \ \
| | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-280-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-270-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-250-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-210-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-200-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-180-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-130-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-120-0/+0
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-110-0/+0
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
| | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | * | | Bring back ADB_EXTERNAL_STORAGE.Jeff Sharkey2012-09-061-0/+1
| | | | | | | | | | | | | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-060-0/+0
| | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-030-0/+0
| | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-230-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-210-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | * | | tuna: prebuilt kernel (HSMMC1 suspend fix)Todd Poynor2012-08-150-0/+0
| | | | | | | | | | | | | | | | | | | | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-150-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | * | | tuna: prebuilt kernel (BT power, DDK revert, gadget fix)Todd Poynor2012-08-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * | | Revert "prebuilt kernel (DDK 1.9RC1, usb gadget,...)"JP Abgrall2012-08-080-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 3b26b79f: tuna: prebuilt kernel (wifi wakelock revert, uname security fix)Todd Poynor2012-11-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | tuna: prebuilt kernel (wifi wakelock revert, uname security fix)Todd Poynor2012-11-020-0/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am 405ef82c: tuna: kernel prebuiltDmitry Shmidt2012-10-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | tuna: kernel prebuiltDmitry Shmidt2012-10-240-0/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | am 1973c025: Merge "Report feature "android.hardware.audio.low_latency"" into...Glenn Kasten2012-10-181-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Report feature "android.hardware.audio.low_latency"" into jb-mr1-devGlenn Kasten2012-10-181-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \