summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tuna: kernel prebuiltTodd Poynor2011-12-011-0/+0
* tuna: Prebuilt kernelTodd Poynor2011-11-301-0/+0
* tuna: update prebuilt kernelIliyan Malchev2011-11-301-0/+0
* tuna: update prebuilt kernelIliyan Malchev2011-11-291-0/+0
* tuna: update prebuilt kernelIliyan Malchev2011-11-281-0/+0
* Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-220-0/+0
|\
| * merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-220-0/+0
| |\
| | \
| \ \
*-. \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-220-0/+0
|\ \ \ \ | | |_|/ | |/| |
| | * | New Prime prebuiltPaul Eastham2011-11-211-0/+0
| | * | New kernel prebuiltPaul Eastham2011-11-211-0/+0
| * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-210-0/+0
| |\ \ \
| | * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-180-0/+0
| | |\ \ \
* | | \ \ \ resolved conflicts for merge of 5dce5e40 to ics-mr1Benoit Goby2011-11-210-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | tuna: new kernel prebuilt -- DO NOT MERGEBenoit Goby2011-11-211-0/+0
| |/ / / /
* | | | | Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1Nick Pelly2011-11-213-2/+7
|\ \ \ \ \
| * | | | | Replace vendor specific NfcGoogle.apk with generic Nfc.apkNick Pelly2011-11-213-2/+7
* | | | | | Merge "new kernel prebuilt" into ics-mr1Erik Gilling2011-11-211-0/+0
|\ \ \ \ \ \
| * | | | | | new kernel prebuiltErik Gilling2011-11-211-0/+0
* | | | | | | resolved conflicts for merge of 7db4602f into ics-mr1Erik Gilling2011-11-210-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | new kernel prebuiltErik Gilling2011-11-211-0/+0
| | |/ / / | |/| | |
* | | | | tuna: update kernel prebuiltColin Cross2011-11-181-0/+0
* | | | | Merge commit 'f79e5819' into ics-mr1Colin Cross2011-11-180-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | tuna: update kernel prebuilt - DO NOT MERGEColin Cross2011-11-181-0/+0
* | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-180-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-180-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge "new kernel prebuilt" into ics-mr1Erik Gilling2011-11-181-0/+0
|\ \ \ \ \
| * | | | | new kernel prebuiltErik Gilling2011-11-181-0/+0
* | | | | | resolved conflicts for merge of b835e7c0 into ics-mr1Erik Gilling2011-11-180-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | new kernel prebuilt -- DO NOT MERGEErik Gilling2011-11-181-0/+0
* | | | | | am 07dc7420: require bootloader KK15Ed Heyl2011-11-181-1/+1
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | require bootloader KK15Ed Heyl2011-11-181-1/+1
* | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-11-170-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-170-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | resolved conflicts for merge of 9bb151e621c6a3e8a3753ac878e236e0a712ce99 into...Simon Wilson2011-11-160-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | new kernel prebuilt -- DO NOT MERGESimon Wilson2011-11-161-0/+0
* | | | | tuna: update prebuilt kernelIliyan Malchev2011-11-161-0/+0
* | | | | Merge "Set NFC load modulation parameters to recommended values." into ics-mr1Martijn Coenen2011-11-162-1/+16
|\ \ \ \ \
| * | | | | Set NFC load modulation parameters to recommended values.Martijn Coenen2011-11-162-1/+16
* | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-161-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-161-1/+1
| | |_|/ / | |/| | |
* | | | | No-op merge from ics-mr0The Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | | | |
| \ \ \ \
*-. \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
|\ \ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | |
| | * | | tuna: update kernel prebuilt for MR0 - DO NOT MERGEColin Cross2011-11-111-0/+0
| | * | | tuna: update kernel prebuilt for MR0 - DO NOT MERGEColin Cross2011-11-101-0/+0
| | * | | tuna: update kernel prebuilt for MR0 - DO NOT MERGEColin Cross2011-11-101-0/+0
| * | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-150-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-150-0/+0
| | |\ \ \
| | | * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-140-0/+0
| | | |\ \ \
| | | | * \ \ merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-130-0/+0
| | | | |\ \ \