summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reduce sound assets size.Eric Laurent2011-11-083-0/+0
* Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-072-2/+2
|\
| * Import revised translations. DO NOT MERGEEric Fischer2011-11-072-2/+2
* | Merge "Get EEPROM settings from NFC HAL." into ics-mr1Martijn Coenen2011-11-072-119/+30
|\ \
| * | Get EEPROM settings from NFC HAL.Martijn Coenen2011-11-042-119/+30
* | | Merge "Remove static background image from Beam when no hw-acceleration." int...Martijn Coenen2011-11-073-29/+1
|\ \ \ | |_|/ |/| |
| * | Remove static background image from Beam when no hw-acceleration.Martijn Coenen2011-11-033-29/+1
* | | Merge "Check for navigation bar when cropping Beam screenshot." into ics-mr1Martijn Coenen2011-11-041-4/+7
|\ \ \ | |/ /
| * | Check for navigation bar when cropping Beam screenshot.Martijn Coenen2011-11-031-4/+7
| |/
* | Merge "Don't finish Beam animation again." into ics-mr1Martijn Coenen2011-11-042-2/+6
|\ \
| * | Don't finish Beam animation again.Martijn Coenen2011-11-032-2/+6
| |/
* | Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ | |/ |/|
| * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-11-024-124/+10
| * merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| |\
* | \ Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
|\ \ \ | | |/ | |/|
| * | Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-11-024-124/+10
| * | merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| |\ \ | | |/ | |/|
| | * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-11-024-124/+10
| |/
* | Merge "Import revised translations." into ics-mr1Eric Fischer2011-11-012-0/+28
|\ \
| * | Import revised translations.Eric Fischer2011-11-012-0/+28
* | | am 08956967: 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
| |\
| | * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-10-314-124/+10
| |/
* | am ea499450: 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 "Add event logs for NFC events. DO NOT MERGE"The Android Automerger2011-10-304-124/+10
| | * merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-10-300-0/+0
| | |\ | |/ /
| | * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-10-284-124/+10
| |/
* | Add event logs for NFC events. DO NOT MERGEJeff Hamilton2011-10-284-10/+124
* | am 79faaaec: (-s ours) Merge "Add event logs for NFC events. DO NOT MERGE" in...Jeff Hamilton2011-10-280-0/+0
|\ \ | |/
| * Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0Jeff Hamilton2011-10-284-10/+124
| |\
| | * Add event logs for NFC events. DO NOT MERGEJeff Hamilton2011-10-274-10/+124
* | | am fb21ff75: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-10-270-0/+0
|\ \ \ | |/ /
| * | Import revised translations. DO NOT MERGEEric Fischer2011-10-271-1/+1
| |/
* | Import revised translations. DO NOT MERGEEric Fischer2011-10-261-1/+1
* | am 628d629a: (-s ours) Merge "DO NOT MERGE. Set NFC EEPROM area to default va...Nick Pelly2011-10-260-0/+0
|\ \ | |/
| * Merge "DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7." into...Nick Pelly2011-10-261-1/+2
| |\
| | * DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7.Martijn Coenen2011-10-261-1/+2
* | | Merge "EEPROM values for NFC FW 109.11" into ics-mr1Nick Pelly2011-10-261-3/+8
|\ \ \
| * | | EEPROM values for NFC FW 109.11Martijn Coenen2011-10-251-3/+8
* | | | Merge "Write NFC EEPROM setting for lower-power poll measurements to default....Martijn Coenen2011-10-261-43/+44
|\ \ \ \ | |/ / /
| * | | Write NFC EEPROM setting for lower-power poll measurements to default.Martijn Coenen2011-10-251-43/+44
| | |/ | |/|
* | | Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl2011-10-251-1/+1
|\ \ \ | | |/ | |/|
| * | Import revised translations. DO NOT MERGEEric Fischer2011-10-241-1/+1
| |/
* | am 94dc4266: Merge "NFC: Enable guard host timeout." into ics-mr0Martijn Coenen2011-10-214-3/+27
|\ \ | |/
| * Merge "NFC: Enable guard host timeout." into ics-mr0Martijn Coenen2011-10-214-3/+27
| |\
| | * NFC: Enable guard host timeout.Martijn Coenen2011-10-214-3/+27
* | | am 51c44537: Merge "Start all NFC activities from a dedicated root task." int...Martijn Coenen2011-10-213-37/+81
|\ \ \ | |/ /
| * | Merge "Start all NFC activities from a dedicated root task." into ics-mr0Martijn Coenen2011-10-213-37/+81
| |\ \ | | |/ | |/|
| | * Start all NFC activities from a dedicated root task.Martijn Coenen2011-10-173-37/+81
generated by cgit v1.1 at 2025-01-11 02:16:26 +0000