summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* NFC: HAL implementation for tuna.Martijn Coenen2011-11-043-0/+160
* am e7168e1f: require bootloader KK02Ed Heyl2011-11-031-1/+1
|\
| * require bootloader KK02Ed Heyl2011-11-031-1/+1
* | Merge "sensors: Return a calculated lux value instead using the current 8 ent...Arve Hjønnevåg2011-11-024-45/+13
|\ \
| * | sensors: Return a calculated lux value instead using the current 8 entry tableArve Hjønnevåg2011-11-014-45/+13
* | | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
|\ \ \
| * | | tuna: update kernel prebuilt for MR0 - DO NOT MERGEThe Android Automerger2011-11-021-0/+0
| * | | Revert "Require bootloader KJ12"The Android Automerger2011-11-021-1/+1
| * | | Revert "Merge "tuna: interactive governor timer 100ms, min sample 10ms" into ...The Android Automerger2011-11-021-4/+0
| * | | Reconcile with ics-factoryrom-2-releaseThe Android Automerger2011-11-020-0/+0
| |\ \ \
| | * | | tuna: update kernel prebuilt for MR0 - DO NOT MERGEThe Android Automerger2011-11-021-0/+0
| | * | | Revert "Require bootloader KJ12"The Android Automerger2011-11-021-1/+1
| |/ / /
* | | | am 7e9ed94c: require bootloader KK01Ed Heyl2011-11-021-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | require bootloader KK01Ed Heyl2011-11-021-1/+1
| |/ /
* | | am 65d257b7: tuna: Update touch firmware to version 0x70/0x71Dima Zavin2011-11-022-0/+0
|\ \ \ | |/ / | | / | |/ |/|
| * tuna: Update touch firmware to version 0x70/0x71Dima Zavin2011-11-012-0/+0
* | Merge "Import revised translations." into ics-mr1Eric Fischer2011-11-012-0/+62
|\ \
| * | Import revised translations.Eric Fischer2011-11-012-0/+62
* | | am f20a35e8: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-010-0/+0
|\ \ \ | | |/ | |/|
| * | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-010-0/+0
| |\ \
| | * | New kernel prebuilt - for factoryrom-2 branch only - DO NOT MERGEThe Android Automerger2011-10-311-0/+0
| | * | Revert "Merge "tuna: interactive governor timer 100ms, min sample 10ms" into ...The Android Automerger2011-10-311-4/+0
* | | | am 8785bf1f: Require bootloader KJ12Paul Eastham2011-11-011-1/+1
|\ \ \ \ | |/ / /
| * | | Require bootloader KJ12Paul Eastham2011-11-011-1/+1
| |/ /
* | | Merge "audio: force speaker route for call when docked" into ics-mr1Simon Wilson2011-10-311-3/+6
|\ \ \
| * | | audio: force speaker route for call when dockedSimon Wilson2011-10-311-3/+6
* | | | am e3e0b4ab: Merge "tuna: update kernel prebuilt" into ics-mr0Colin Cross2011-10-311-0/+0
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge "tuna: update kernel prebuilt" into ics-mr0Colin Cross2011-10-311-0/+0
| |\ \
| | * | tuna: update kernel prebuiltColin Cross2011-10-301-0/+0
* | | | am 3cfa43fd: Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-10-310-0/+0
| |\ \ | | |/ | |/|
| | * Revert "tuna: interactive governor timer 100ms, min sample 10ms"The Android Automerger2011-10-301-4/+0
| | * New kernel prebuilt - for factoryrom-2 branch only - DO NOT MERGEPaul Eastham2011-10-301-0/+0
| | * merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-10-300-0/+0
| | |\ | |/ /
| | * Update kernel prebuilt - For MR0The Android Automerger2011-10-281-0/+0
| | * Update kernel prebuilt - For MR0The Android Automerger2011-10-281-0/+0
| | * Revert "new kernel prebuilt"The Android Automerger2011-10-281-0/+0
| | * Revert "Merge "tuna: interactive governor timer 100ms, min sample 10ms" into ...The Android Automerger2011-10-281-4/+0
| | * Revert "Update kernel prebuilt"The Android Automerger2011-10-281-0/+0
| | * Revert "Merge "New Prime prebuilt" into ics-mr0"The Android Automerger2011-10-281-0/+0
| |/
* | am d9d59081: new kernel prebuiltErik Gilling2011-10-291-0/+0
|\ \ | |/
| * new kernel prebuiltErik Gilling2011-10-281-0/+0
* | am 490e9455: Merge "Limit output bitrate from 1080P video recording to 12Mbps...James Dong2011-10-291-3/+3
|\ \ | |/
| * Merge "Limit output bitrate from 1080P video recording to 12Mbps" into ics-mr0James Dong2011-10-281-3/+3
| |\
| | * Limit output bitrate from 1080P video recording to 12MbpsJames Dong2011-10-281-3/+3
* | | am 1ce41e35: Merge "tuna: interactive governor timer 100ms, min sample 10ms" ...Todd Poynor2011-10-291-0/+4
|\ \ \ | |/ /
| * | Merge "tuna: interactive governor timer 100ms, min sample 10ms" into ics-mr0Todd Poynor2011-10-281-0/+4
| |\ \
| | * | tuna: interactive governor timer 100ms, min sample 10msTodd Poynor2011-10-281-0/+4
* | | | am b8a768c0: Update kernel prebuiltDima Zavin2011-10-281-0/+0
|\ \ \ \ | |/ / /
| * | | Update kernel prebuiltDima Zavin2011-10-281-0/+0
| | |/ | |/|