| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| * | Import translations. DO NOT MERGE | Eric Fischer | 2012-05-25 | 48 | -629/+713 | |
| * | am 085bde96: Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-24 | 0 | -0/+0 | |
| |\ | ||||||
| | *-. | Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-24 | 0 | -0/+0 | |
| | |\ \ | ||||||
| | | | * | merge in nakasi-factoryrom-release history after reset to jb-dev | The Android Automerger | 2012-05-22 | 0 | -0/+0 | |
| | | | |\ | ||||||
| | | * | \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-23 | 0 | -0/+0 | |
| | | |\ \ \ | | | |/ / | ||||||
| * | | | | | am 7d44aa52: am befa3d6d: Show time in NFC handover notifications. | Martijn Coenen | 2012-05-22 | 1 | -4/+0 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | am befa3d6d: Show time in NFC handover notifications. | Martijn Coenen | 2012-05-22 | 1 | -4/+0 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Show time in NFC handover notifications. | Martijn Coenen | 2012-05-22 | 1 | -4/+0 | |
| * | | | | | am 3309445e: am 973ff9be: Fix some strings. | Martijn Coenen | 2012-05-22 | 1 | -4/+4 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | am 973ff9be: Fix some strings. | Martijn Coenen | 2012-05-22 | 1 | -4/+4 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Fix some strings. | Martijn Coenen | 2012-05-22 | 1 | -4/+4 | |
| * | | | | | am 5dccb9a4: Reconcile with jb-release | The Android Open Source Project | 2012-05-22 | 0 | -0/+0 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Reconcile with jb-release | The Android Open Source Project | 2012-05-22 | 0 | -0/+0 | |
| | |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-20 | 0 | -0/+0 | |
| | | |\ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | | am 67038a30: Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-21 | 0 | -0/+0 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | | | | | | ||||||
| | | \ \ \ | ||||||
| | *-. \ \ \ | Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-18 | 0 | -0/+0 | |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | ||||||
| | | | * | | merge in nakasi-factoryrom-release history after reset to jb-dev | The Android Automerger | 2012-05-18 | 0 | -0/+0 | |
| | | | |\ \ | | |/ / / | ||||||
| | | * | | | Eliminate obsolete flag. | Craig Mautner | 2012-05-17 | 1 | -1/+0 | |
| | | * | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-17 | 0 | -0/+0 | |
| | | |\ \ \ | ||||||
| * | | \ \ \ | am beb7b1b4: am 0de27370: Bluetooth Beam: generate unique filenames. | Martijn Coenen | 2012-05-21 | 1 | -2/+15 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | am 0de27370: Bluetooth Beam: generate unique filenames. | Martijn Coenen | 2012-05-18 | 1 | -2/+15 | |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | | * | | | | Bluetooth Beam: generate unique filenames. | Martijn Coenen | 2012-05-18 | 1 | -2/+15 | |
| * | | | | | | am 91ebf1e2: am 0f2b555f: Don\'t use NPP for connection handover. | Martijn Coenen | 2012-05-21 | 1 | -1/+5 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | am 0f2b555f: Don\'t use NPP for connection handover. | Martijn Coenen | 2012-05-18 | 1 | -1/+5 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| | | * | | | | Don't use NPP for connection handover. | Martijn Coenen | 2012-05-18 | 1 | -1/+5 | |
| * | | | | | | am e769540a: am 1179ee22: Merge "Close NFCEE when NFC is being shut down." in... | Martijn Coenen | 2012-05-21 | 1 | -1/+9 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | am 1179ee22: Merge "Close NFCEE when NFC is being shut down." into jb-dev | Martijn Coenen | 2012-05-17 | 1 | -1/+9 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| | | * | | | | Merge "Close NFCEE when NFC is being shut down." into jb-dev | Martijn Coenen | 2012-05-17 | 1 | -1/+9 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Close NFCEE when NFC is being shut down. | Martijn Coenen | 2012-05-17 | 1 | -1/+9 | |
| * | | | | | | | am 0b610930: am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers... | Martijn Coenen | 2012-05-21 | 5 | -30/+111 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers." into jb-dev | Martijn Coenen | 2012-05-17 | 5 | -30/+111 | |
| | |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | | Merge "Allow cancelling of Bluetooth Beam transfers." into jb-dev | Martijn Coenen | 2012-05-17 | 5 | -30/+111 | |
| | | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | | * | | | | Allow cancelling of Bluetooth Beam transfers. | Martijn Coenen | 2012-05-16 | 5 | -30/+111 | |
| * | | | | | | | am c9f617a9: am b0f96e9d: Merge "Eliminate obsolete flag." into jb-dev | Craig Mautner | 2012-05-21 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | am b0f96e9d: Merge "Eliminate obsolete flag." into jb-dev | Craig Mautner | 2012-05-17 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | | Merge "Eliminate obsolete flag." into jb-dev | Craig Mautner | 2012-05-17 | 1 | -1/+0 | |
| | | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | | | * | | | | Eliminate obsolete flag. | Craig Mautner | 2012-05-17 | 1 | -1/+0 | |
| * | | | | | | | am 8baa9162: am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-fil... | Martijn Coenen | 2012-05-17 | 4 | -66/+288 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-file transfers."... | Martijn Coenen | 2012-05-16 | 4 | -66/+288 | |
| | |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | | * | | | | | Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-dev | Martijn Coenen | 2012-05-16 | 4 | -66/+288 | |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / / | ||||||
| | | | * | | | Bluetooth Beam handover: deal with multi-file transfers. | Martijn Coenen | 2012-05-15 | 4 | -66/+288 | |
| * | | | | | | resolved conflicts for merge of c989f25d to master | Justin Koh | 2012-05-17 | 1 | -20/+33 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Don't instantiate sendUi in Nfc if we are in appliance mode. | Justin Koh | 2012-05-17 | 1 | -20/+33 | |
| * | | | | | | | am 2e0f3b1a: Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-16 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | | | | | | | | ||||||
| | | \ \ \ \ \ | ||||||
| | *-. \ \ \ \ \ | Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-16 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | ||||||
| | | | * | | | | merge in nakasi-factoryrom-release history after reset to jb-dev | The Android Automerger | 2012-05-16 | 0 | -0/+0 | |
| | | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | ||||||
| | | | | * | | | merge in nakasi-factoryrom-release history after reset to jb-dev | The Android Automerger | 2012-05-15 | 0 | -0/+0 | |
| | | | | |\ \ \ | ||||||
| | | * | | \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-16 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | | | * | | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-15 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | | |/ / / | ||||||
| | | | | * | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-14 | 0 | -0/+0 | |
| | | | | |\ \ \ | | | | | |_|/ | | | | |/| | | ||||||
 |
index : packages_apps_nfc.git | |
| packages/apps/nfc | git repository hosting |
| summaryrefslogtreecommitdiffstats |