Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
* | Properly handle missing firmwaresreplicant-4.2-0002replicant-4.2-0001 | Paul Kocialkowski | 2013-11-11 | 2 | -2/+13 | |
* | Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/ext... | Steve Kondik | 2013-02-12 | 2 | -2/+14 | |
|\ | ||||||
| * | Merge "NDEF Type 3 tag reading with padding bytes" into jb-mr1.1-dev | Martijn Coenen | 2012-11-28 | 1 | -1/+13 | |
| |\ | ||||||
| | * | NDEF Type 3 tag reading with padding bytes | Sunil Jogi | 2012-11-27 | 1 | -1/+13 | |
| * | | Increase default IsoDep timeout to 1200ms. | Martijn Coenen | 2012-11-27 | 1 | -1/+1 | |
| |/ | ||||||
* | | libnfc-nxp: Add alternate firmware path | Steve Kondik | 2013-02-06 | 1 | -2/+6 | |
* | | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/ex... | Steve Kondik | 2012-12-27 | 7 | -27/+42 | |
|\ \ | |/ | ||||||
| * | am e4d3c945: Merge "Add support for target-customized NFC stack configuration" | Martijn Coenen | 2012-08-30 | 2 | -19/+23 | |
| |\ | ||||||
| | * | Merge "Add support for target-customized NFC stack configuration" | Martijn Coenen | 2012-08-30 | 2 | -19/+23 | |
| | |\ | ||||||
| | | * | Add support for target-customized NFC stack configuration | Sebastian Niciarz | 2012-08-23 | 2 | -19/+23 | |
| * | | | am cbef2c80: Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix" | Jeff Hamilton | 2012-08-29 | 1 | -0/+1 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix" | Jeff Hamilton | 2012-08-29 | 1 | -0/+1 | |
| | |\ \ | ||||||
| | | * | | HCI ANY_OPEN_PIPE on identity management gate crash fix | Dejan REBRACA | 2012-08-14 | 1 | -0/+1 | |
| | | |/ | ||||||
| * | | | am 1985108c: Merge "Support of topaz tag NFC Forum version number 1.1" | Jeff Hamilton | 2012-08-29 | 1 | -1/+4 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge "Support of topaz tag NFC Forum version number 1.1" | Jeff Hamilton | 2012-08-29 | 1 | -1/+4 | |
| | |\ \ | | | |/ | | |/| | ||||||
| | | * | Support of topaz tag NFC Forum version number 1.1 | Dejan REBRACA | 2012-08-14 | 1 | -1/+4 | |
| | |/ | ||||||
| * | | phHal4Nfc_ADD: fix memcpy overlap | Nick Kralevich | 2012-07-17 | 1 | -5/+8 | |
| * | | phFriNfc_OvrHal: fix memcpy overlap | Nick Kralevich | 2012-07-17 | 1 | -1/+4 | |
| * | | am b668d06f: Reconcile with jb-release | The Android Open Source Project | 2012-06-19 | 0 | -0/+0 | |
| |\ \ | | |/ | ||||||
| | * | Reconcile with jb-release | The Android Open Source Project | 2012-06-19 | 0 | -0/+0 | |
| | |\ | ||||||
| * | \ | am f888888a: am 42fef9f8: Revert "Added addr field in response of Jewel command" | Martijn Coenen | 2012-06-14 | 1 | -63/+0 | |
| |\ \ \ | | |/ / | ||||||
| | * | | am 42fef9f8: Revert "Added addr field in response of Jewel command" | Martijn Coenen | 2012-06-14 | 1 | -63/+0 | |
| | |\ \ | ||||||
| * | \ \ | am 55d095b1: (-s ours) am 144d72d3: Remove some logs in case of abort() (DO N... | Martijn Coenen | 2012-06-12 | 0 | -0/+0 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE). | Martijn Coenen | 2012-06-12 | 1 | -4/+2 | |
| | |\ \ \ | ||||||
| * | | | | | Remove some logs in case of abort(). | Martijn Coenen | 2012-06-08 | 1 | -4/+3 | |
| |/ / / / | ||||||
| * | | | | Reconcile with jb-release | The Android Open Source Project | 2012-05-24 | 0 | -0/+0 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | am ba040759: Fix wrong extern variable size | Sunil Jogi | 2012-05-23 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | \ \ \ \ \ | ||||||
| | \ \ \ \ \ | ||||||
| *-. \ \ \ \ \ | Reconcile with jb-release nakasi-factoryrom-release | The Android Open Source Project | 2012-05-16 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
* | | | | | | | | Merge "On some handsets, there is a configuration of hardware that causes a c... | Steve Kondik | 2012-10-03 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | On some handsets, there is a configuration of hardware that causes a conflict... | doug yeager | 2012-09-26 | 2 | -2/+6 | |
* | | | | | | | | | Merge "card emulation patch port to JB" into jellybean | Steve Kondik | 2012-08-31 | 23 | -1565/+5395 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | card emulation patch port to JB | doug yeager | 2012-08-28 | 23 | -1565/+5395 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'jb-release' of https://android.googlesource.com/platform/extern... | Steve Kondik | 2012-08-10 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Revert "Added addr field in response of Jewel command" | Martijn Coenen | 2012-06-14 | 1 | -63/+0 | |
| * | | | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-06-13 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-05-24 | 0 | -0/+0 | |
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| | | ||||||
| | | * | | merge in jb-release history after reset to master | The Android Automerger | 2012-04-23 | 0 | -0/+0 | |
| | | |\ \ | | | | |/ | | | |/| | ||||||
| | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-04-18 | 0 | -0/+0 | |
| | | | |\ | ||||||
| | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-04-09 | 0 | -0/+0 | |
| | | | | |\ | ||||||
| | | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-03-21 | 0 | -0/+0 | |
| | | | | | |\ | ||||||
| | | | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-03-20 | 0 | -0/+0 | |
| | | | | | | |\ | ||||||
| | | | | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-03-20 | 0 | -0/+0 | |
| | | | | | | | |\ | | | | | | | |/ / | | | | | | |/| / | | | | | | | |/ | ||||||
| | | | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-03-12 | 0 | -0/+0 | |
| | | | | | | |\ | ||||||
| | | | | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-03-08 | 0 | -0/+0 | |
| | | | | | | | |\ | ||||||
| | | | | | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-03-06 | 0 | -0/+0 | |
| | | | | | | | | |\ | ||||||
| | | | | | | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-03-05 | 0 | -0/+0 | |
| | | | | | | | | | |\ | ||||||
| | | | | | | | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-02-07 | 0 | -0/+0 | |
| | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-01-31 | 0 | -0/+0 | |
| | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | * | merge in jb-release history after reset to master | The Android Automerger | 2012-01-30 | 0 | -0/+0 | |
| | | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2012-01-25 | 0 | -0/+0 | |
| | | | | | | | | | | | | | |\ |