| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | resolved conflicts for merge of ebf4b36e to master | Nick Pelly | 2011-11-11 | 5 | -35/+393 |
| |\ | |||||
| | * | Merge "Implement static white-list access control for NFC-EE." into ics-mr1 | Nick Pelly | 2011-11-11 | 5 | -35/+393 |
| | |\ | |||||
| | | * | Implement static white-list access control for NFC-EE. | Jeff Hamilton | 2011-11-11 | 5 | -35/+393 |
| * | | | am d9203771: Optimize soundpool use. | Martijn Coenen | 2011-11-11 | 2 | -31/+58 |
| |\ \ \ | |/ / | |||||
| | * | | Optimize soundpool use. | Martijn Coenen | 2011-11-11 | 2 | -31/+58 |
| | |/ | |||||
| * | | Allow EEPROM settings override using properties. | Martijn Coenen | 2011-11-11 | 1 | -3/+20 |
| * | | Merge "Import revised translations." | Eric Fischer | 2011-11-10 | 46 | -186/+186 |
| |\ \ | |||||
| | * | | Import revised translations. | Eric Fischer | 2011-11-10 | 46 | -186/+186 |
| * | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-10 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-09 | 0 | -0/+0 |
| | |\ \ \ | |||||
| | | * \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-08 | 0 | -0/+0 |
| | | |\ \ \ | |||||
| * | | \ \ \ | am 133d5fee: (-s ours) am 88194cf3: (-s ours) Import revised translations. D... | Eric Fischer | 2011-11-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | | am 88194cf3: (-s ours) Import revised translations. DO NOT MERGE | Eric Fischer | 2011-11-09 | 0 | -0/+0 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | | * | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-11-08 | 2 | -2/+2 |
| * | | | | | | am c1c09483: Reduce sound assets size. | Eric Laurent | 2011-11-10 | 3 | -0/+0 |
| |\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| | * | | | | Reduce sound assets size. | Eric Laurent | 2011-11-08 | 3 | -0/+0 |
| | | |/ / | |/| | | |||||
| * | | | | am d7bca9eb: (-s ours) Merge "Import revised translations. DO NOT MERGE" int... | Eric Fischer | 2011-11-07 | 0 | -0/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1 | Eric Fischer | 2011-11-07 | 2 | -2/+2 |
| | |\ \ \ | |||||
| | | * | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-11-07 | 2 | -2/+2 |
| * | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-07 | 0 | -0/+0 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-06 | 0 | -0/+0 |
| | |\ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | | am cbc85676: Merge "Get EEPROM settings from NFC HAL." into ics-mr1 | Martijn Coenen | 2011-11-07 | 2 | -119/+30 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | Merge "Get EEPROM settings from NFC HAL." into ics-mr1 | Martijn Coenen | 2011-11-07 | 2 | -119/+30 |
| | |\ \ \ \ | |||||
| | | * | | | | Get EEPROM settings from NFC HAL. | Martijn Coenen | 2011-11-04 | 2 | -119/+30 |
| * | | | | | | am f7a151e2: Merge "Remove static background image from Beam when no hw-accel... | Martijn Coenen | 2011-11-07 | 3 | -29/+1 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge "Remove static background image from Beam when no hw-acceleration." int... | Martijn Coenen | 2011-11-07 | 3 | -29/+1 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | | * | | | | Remove static background image from Beam when no hw-acceleration. | Martijn Coenen | 2011-11-03 | 3 | -29/+1 |
| * | | | | | | am a2181682: Merge "Check for navigation bar when cropping Beam screenshot." ... | Martijn Coenen | 2011-11-05 | 1 | -4/+7 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge "Check for navigation bar when cropping Beam screenshot." into ics-mr1 | Martijn Coenen | 2011-11-04 | 1 | -4/+7 |
| | |\ \ \ \ \ | | |/ / / / | |||||
| | | * | | | | Check for navigation bar when cropping Beam screenshot. | Martijn Coenen | 2011-11-03 | 1 | -4/+7 |
| | | |/ / / | |||||
| * | | | | | am 304a7304: Merge "Don\'t finish Beam animation again." into ics-mr1 | Martijn Coenen | 2011-11-05 | 2 | -2/+6 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge "Don't finish Beam animation again." into ics-mr1 | Martijn Coenen | 2011-11-04 | 2 | -2/+6 |
| | |\ \ \ \ | |||||
| | | * | | | | Don't finish Beam animation again. | Martijn Coenen | 2011-11-03 | 2 | -2/+6 |
| | | |/ / / | |||||
| * | | | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-04 | 0 | -0/+0 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-02 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-10-30 | 0 | -0/+0 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-10-27 | 0 | -0/+0 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-10-26 | 0 | -0/+0 |
| | | | | |\ \ \ \ | |||||
| | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-23 | 0 | -0/+0 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-20 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ | |||||
| | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-19 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-18 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-13 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-12 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-11 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-10-03 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-28 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-25 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | | | | | | | | | * \ \ \ | merge in ics-release history after reset to master | The Android Automerger | 2011-09-22 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ \ \ \ | |||||
 |
index : packages_apps_nfc.git | |
| packages/apps/nfc | git repository hosting |
| summaryrefslogtreecommitdiffstats |