summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Firmware data load from a static file instead of a libraryHEADreplicant-4.2-0004replicant-4.2-0003replicant-4.2Paul Kocialkowski2014-09-012-23/+52
* Revert "Properly handle missing firmwares"Paul Kocialkowski2014-09-012-13/+2
* Properly handle missing firmwaresreplicant-4.2-0002replicant-4.2-0001Paul Kocialkowski2013-11-112-2/+13
* Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/ext...Steve Kondik2013-02-122-2/+14
|\
| * Merge "NDEF Type 3 tag reading with padding bytes" into jb-mr1.1-devMartijn Coenen2012-11-281-1/+13
| |\
| | * NDEF Type 3 tag reading with padding bytesSunil Jogi2012-11-271-1/+13
| * | Increase default IsoDep timeout to 1200ms.Martijn Coenen2012-11-271-1/+1
| |/
* | libnfc-nxp: Add alternate firmware pathSteve Kondik2013-02-061-2/+6
* | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/ex...Steve Kondik2012-12-277-27/+42
|\ \ | |/
| * am e4d3c945: Merge "Add support for target-customized NFC stack configuration"Martijn Coenen2012-08-302-19/+23
| |\
| | * Merge "Add support for target-customized NFC stack configuration"Martijn Coenen2012-08-302-19/+23
| | |\
| | | * Add support for target-customized NFC stack configurationSebastian Niciarz2012-08-232-19/+23
| * | | am cbef2c80: Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton2012-08-291-0/+1
| |\ \ \ | | |/ /
| | * | Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton2012-08-291-0/+1
| | |\ \
| | | * | HCI ANY_OPEN_PIPE on identity management gate crash fixDejan REBRACA2012-08-141-0/+1
| | | |/
| * | | am 1985108c: Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton2012-08-291-1/+4
| |\ \ \ | | |/ /
| | * | Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton2012-08-291-1/+4
| | |\ \ | | | |/ | | |/|
| | | * Support of topaz tag NFC Forum version number 1.1Dejan REBRACA2012-08-141-1/+4
| | |/
| * | phHal4Nfc_ADD: fix memcpy overlapNick Kralevich2012-07-171-5/+8
| * | phFriNfc_OvrHal: fix memcpy overlapNick Kralevich2012-07-171-1/+4
| * | am b668d06f: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ | | |/
| | * Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| | |\
| * | \ am f888888a: am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
| |\ \ \ | | |/ /
| | * | am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
| | |\ \
| * | \ \ am 55d095b1: (-s ours) am 144d72d3: Remove some logs in case of abort() (DO N...Martijn Coenen2012-06-120-0/+0
| |\ \ \ \ | | |/ / /
| | * | | am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen2012-06-121-4/+2
| | |\ \ \
| * | | | | Remove some logs in case of abort().Martijn Coenen2012-06-081-4/+3
| |/ / / /
| * | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-240-0/+0
| |\ \ \ \
| * \ \ \ \ am ba040759: Fix wrong extern variable sizeSunil Jogi2012-05-231-1/+1
| |\ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-. \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
* | | | | | | | Merge "On some handsets, there is a configuration of hardware that causes a c...Steve Kondik2012-10-032-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | On some handsets, there is a configuration of hardware that causes a conflict...doug yeager2012-09-262-2/+6
* | | | | | | | | Merge "card emulation patch port to JB" into jellybeanSteve Kondik2012-08-3123-1565/+5395
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | card emulation patch port to JBdoug yeager2012-08-2823-1565/+5395
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jb-release' of https://android.googlesource.com/platform/extern...Steve Kondik2012-08-100-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Revert "Added addr field in response of Jewel command"Martijn Coenen2012-06-141-63/+0
| * | | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| |
| | | * | merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | |\ \ | | | | |/ | | | |/|
| | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-180-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| | | | | | |\
| | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | | |\ | | | | | | | |/ / | | | | | | |/| / | | | | | | | |/
| | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-120-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-080-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-050-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-070-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-310-0/+0
| | | | | | | | | | | | |\
generated by cgit v1.1 at 2024-04-23 19:12:55 +0000