| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.ap... | Nick Pelly | 2011-11-21 | 8 | -16/+8 |
| |\ | |||||
| | * | Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 | Nick Pelly | 2011-11-21 | 8 | -16/+8 |
| | |\ | |||||
| | | * | Replace vendor specific NfcGoogle.apk with generic Nfc.apk | Nick Pelly | 2011-11-21 | 8 | -16/+8 |
| * | | | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-11-18 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-17 | 0 | -0/+0 |
| | |\ \ \ | | |_|/ | |/| | | |||||
| | | * | | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-16 | 0 | -0/+0 |
| | | |\ \ | |||||
| | | | * \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-15 | 0 | -0/+0 |
| | | | |\ \ | |||||
| | | | | * \ | merge in ics-mr1-release history after reset to ics-mr1 | The Android Automerger | 2011-11-13 | 0 | -0/+0 |
| | | | | |\ \ | |||||
| * | | | | \ \ | am 806a7827: Merge "Also send NFCEE broadcasts to dynamically registered rece... | Martijn Coenen | 2011-11-17 | 1 | -9/+6 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | | Merge "Also send NFCEE broadcasts to dynamically registered receivers." into ... | Martijn Coenen | 2011-11-17 | 1 | -9/+6 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Also send NFCEE broadcasts to dynamically registered receivers. | Martijn Coenen | 2011-11-17 | 1 | -9/+6 |
| | | |/ / / / / | |||||
| * | | | | | | | am 078e8368: Merge "Set up DISCOVERY and SE notification callbacks at NFC ini... | Nick Pelly | 2011-11-17 | 1 | -62/+69 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge "Set up DISCOVERY and SE notification callbacks at NFC init." into ics-mr1 | Nick Pelly | 2011-11-17 | 1 | -62/+69 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | | * | | | | | Set up DISCOVERY and SE notification callbacks at NFC init. | Nick Pelly | 2011-11-16 | 1 | -62/+69 |
| | | |/ / / / | |||||
| * | | | | | | am bc6535cc: (-s ours) Merge "Import revised translations. DO NOT MERGE" int... | Eric Fischer | 2011-11-17 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1 | Eric Fischer | 2011-11-16 | 48 | -96/+0 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-11-16 | 48 | -96/+0 |
| | | | |/ / / | | |/| | | | |||||
| * | | | | | | am 59137f77: No-op merge from ics-mr0 | The Android Open Source Project | 2011-11-17 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | No-op merge from ics-mr0 | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | | * | | | | Reconcile with ics-factoryrom-2-release | The Android Open Source Project | 2011-11-16 | 0 | -0/+0 |
| | | |\ \ \ \ | |||||
| * | | \ \ \ \ | am 2b093e93: Merge "Enable NFC-EE immediately when screen is on but locked." ... | Nick Pelly | 2011-11-15 | 1 | -92/+143 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge "Enable NFC-EE immediately when screen is on but locked." into ics-mr1 | Nick Pelly | 2011-11-15 | 1 | -92/+143 |
| | |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | | * | | | | | Enable NFC-EE immediately when screen is on but locked. | mike wakerly | 2011-11-15 | 1 | -92/+143 |
| * | | | | | | | am f4226b69: Merge "Add null check to aovid NPE on un-matched close()." into ... | Nick Pelly | 2011-11-15 | 2 | -9/+7 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1 | Nick Pelly | 2011-11-14 | 2 | -9/+7 |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | | | |||||
| | | * | | | | Add null check to aovid NPE on un-matched close(). | Nick Pelly | 2011-11-14 | 2 | -9/+7 |
| * | | | | | | 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 |
 |
index : packages_apps_nfc.git | |
| packages/apps/nfc | git repository hosting |
| summaryrefslogtreecommitdiffstats |