summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-131-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-081-0/+0
* | | Merge "Specify destination sdcard mount point." into jb-mr1-devJeff Sharkey2012-08-131-1/+1
|\ \ \
| * | | Specify destination sdcard mount point.Jeff Sharkey2012-08-131-1/+1
| |/ /
* | | tuna: prebuilt kernel (BT power, DDK revert, gadget fix)Todd Poynor2012-08-131-0/+0
|/ /
* | Merge "Update config.xml overlay for new key config_overlay_locationProviderP...Nick Pelly2012-08-101-5/+3
|\ \
| * | Update config.xml overlay for new key config_overlay_locationProviderPackageN...Nick Pelly2012-08-091-5/+3
* | | am 486ff618: am 18c08871: Merge "Fix build - Add TARGET_ARCH := arm"Jean-Baptiste Queru2012-08-101-0/+1
|\ \ \ | |/ / |/| |
| * | am 18c08871: Merge "Fix build - Add TARGET_ARCH := arm"Jean-Baptiste Queru2012-08-101-0/+1
| |\ \
| | * \ Merge "Fix build - Add TARGET_ARCH := arm"Jean-Baptiste Queru2012-08-101-0/+1
| | |\ \
| | | * | Fix build - Add TARGET_ARCH := armJean-Baptiste Queru2012-08-101-0/+1
| | |/ /
* | | | Revert "prebuilt kernel (DDK 1.9RC1, usb gadget,...)"JP Abgrall2012-08-081-0/+0
| |_|/ |/| |
* | | prebuilt kernel (DDK 1.9RC1, usb gadget,...)JP Abgrall2012-08-071-0/+0
* | | am ff348a5d: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
|\ \ \ | |/ /
| * | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
| |\ \
| | * \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-070-0/+0
| | |\ \
* | | \ \ am afbf2174: (-s ours) am b69d5d1b: tuna: kernel prebuilt DO NOT MERGEMike Lockwood2012-08-060-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am b69d5d1b: tuna: kernel prebuilt DO NOT MERGEMike Lockwood2012-08-061-0/+0
| |\ \ \ \ | | |/ / /
| | * | | tuna: kernel prebuilt DO NOT MERGEMike Lockwood2012-08-041-0/+0
* | | | | am 8a6e4e7a: am de5687d9: Merge "add permissions to dev/cdam_cplog"Wink Saville2012-08-041-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | am de5687d9: Merge "add permissions to dev/cdam_cplog"Wink Saville2012-08-041-0/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "add permissions to dev/cdam_cplog"Wink Saville2012-08-041-0/+3
| | |\ \ \
| | | * | | add permissions to dev/cdam_cplogdw0918.jeon2012-08-021-0/+3
* | | | | | am 56fd40d6: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-08-030-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reconcile with jb-release - do not mergeThe Android Open Source Project2012-08-030-0/+0
| |\ \ \ \ \
| | * \ \ \ \ Reconcile AOSP and GOOG jb-releaseThe Android Open Source Project2012-08-030-0/+0
| | |\ \ \ \ \
| | | * | | | | tuna: kernel prebuiltBenoit Goby2012-08-031-0/+0
* | | | | | | | am 0440f359: am 2c119692: Merge "add toroplus to the recovery target"Jean-Baptiste Queru2012-08-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 2c119692: Merge "add toroplus to the recovery target"Jean-Baptiste Queru2012-08-021-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "add toroplus to the recovery target"Jean-Baptiste Queru2012-08-021-1/+1
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | add toroplus to the recovery targetMadan Ankapura2012-08-021-1/+1
| | |/ / / / /
* | | | | | | am 9d64e08b: Reconcile with jb-releaseThe Android Open Source Project2012-07-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-07-270-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | tuna: kernel prebuiltBenoit Goby2012-07-241-0/+0
| | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | tuna: kernel prebuiltBenoit Goby2012-07-241-0/+0
| | |/ / / /
* | | | | | tuna: kernel prebuiltDmitry Shmidt2012-07-271-0/+0
* | | | | | am 1a377cba: Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-190-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-190-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-170-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
* | | | | tuna: dumpstate: Add wlan info dumpDmitry Shmidt2012-07-171-0/+1
* | | | | Merge "added bt-pan network interface for tethering"Matthew Xie2012-07-161-1/+1
|\ \ \ \ \
| * | | | | added bt-pan network interface for tetheringzzy2012-07-131-1/+1
* | | | | | Merge "Add bthid device driver ko file. Init it as device driver node. Author...Matthew Xie2012-07-163-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add bthid device driver ko file. Init it as device driver node.Matthew Xie2012-07-133-0/+8
* | | | | | am b7065fec: am 32c13ca6: tuna: kernel prebuiltBenoit Goby2012-07-161-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | am 32c13ca6: tuna: kernel prebuiltBenoit Goby2012-07-161-0/+0
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | tuna: kernel prebuiltBenoit Goby2012-07-161-0/+0