summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | am 91710ed9: am 59827416: am 74decc93: Do not wait 3ms before each write.Nick Pelly2011-06-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 59827416: am 74decc93: Do not wait 3ms before each write.Nick Pelly2011-05-291-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 74decc93: Do not wait 3ms before each write.Nick Pelly2011-05-231-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Do not wait 3ms before each write.Nick Pelly2011-05-231-1/+1
| | | |/ / / /
* | | | | | | am 5d96b2d2: am 5a9fc269: Properly merge \'Patch to enable low level traces.\'Daniel Tomas2011-06-021-6/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5a9fc269: Properly merge \'Patch to enable low level traces.\'Daniel Tomas2011-05-291-6/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Properly merge 'Patch to enable low level traces.'Daniel Tomas2011-05-231-6/+4
* | | | | | | am d9ebeefb: am 944e51f4: Merge from gingerbreadJean-Baptiste Queru2011-05-244-0/+48
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 944e51f4: Merge from gingerbreadJean-Baptiste Queru2011-05-234-0/+48
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge from gingerbreadJean-Baptiste Queru2011-05-234-0/+48
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Patch to enable low level traces.Daniel Tomas2011-05-194-0/+46
* | | | | | | Reconcile with gingerbread-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-05-130-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Enable P2P 106 passive (again).Nick Pelly2011-04-181-2/+2
* | | | | | | am ec4b865b: am f4770c64: am 65179442: Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-191-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am f4770c64: am 65179442: Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-181-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 65179442: Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-181-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fixed LLCP SAP value range.Sylvain Fonteneau2011-05-161-1/+1
| | | |/ / /
* | | | | | am 2af3967e: am a3a6104e: am 92c7e014: Retry i2c read 5 times on i2c read error.Nick Pelly2011-05-121-0/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a3a6104e: am 92c7e014: Retry i2c read 5 times on i2c read error.Nick Pelly2011-05-121-0/+11
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 92c7e014: Retry i2c read 5 times on i2c read error.Nick Pelly2011-05-121-0/+11
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | Retry i2c read 5 times on i2c read error.Nick Pelly2011-05-121-0/+11
* | | | | am 20f7995a: am 7825db42: am e5201c15: Patch to perform a recover in case of ...Daniel Tomas2011-04-261-11/+23
|\ \ \ \ \ | |/ / / /
| * | | | am 7825db42: am e5201c15: Patch to perform a recover in case of a transaction...Daniel Tomas2011-04-261-11/+23
| |\ \ \ \ | | |/ / /
| | * | | am e5201c15: Patch to perform a recover in case of a transaction failureDaniel Tomas2011-04-261-11/+23
| | |\ \ \ | | | |/ /
| | | * | Patch to perform a recover in case of a transaction failureDaniel Tomas2011-04-261-11/+23
* | | | | am e4a547cf: am 4ce9f49c: am 17018c3f: Merge "Enable P2P 106 passive (again)....Jeff Hamilton2011-04-171-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 4ce9f49c: am 17018c3f: Merge "Enable P2P 106 passive (again)." into ginger...Jeff Hamilton2011-04-171-2/+2
| |\ \ \ \ | | |/ / /
| | * | | am 17018c3f: Merge "Enable P2P 106 passive (again)." into gingerbreadJeff Hamilton2011-04-171-2/+2
| | |\ \ \ | | | |/ /
| | | * | Merge "Enable P2P 106 passive (again)." into gingerbreadJeff Hamilton2011-04-171-2/+2
| | | |\ \
| | | | * | Enable P2P 106 passive (again).Nick Pelly2011-04-151-2/+2
* | | | | | am 74c281e8: am 32e6c583: am 7b40e6d4: Avoid missing NFCIP inbound frame.Sylvain Fonteneau2011-04-141-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 32e6c583: am 7b40e6d4: Avoid missing NFCIP inbound frame.Sylvain Fonteneau2011-04-141-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 7b40e6d4: Avoid missing NFCIP inbound frame.Sylvain Fonteneau2011-04-141-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Avoid missing NFCIP inbound frame.Sylvain Fonteneau2011-04-141-1/+1
| | | |/ /
* | | | | am ef2cdb70: am fb23feb2: am 46dbed4e: Ignore unreadable TLVs during LLCP act...Sylvain Fonteneau2011-04-112-9/+15
|\ \ \ \ \ | |/ / / /
| * | | | am fb23feb2: am 46dbed4e: Ignore unreadable TLVs during LLCP activation and C...Sylvain Fonteneau2011-04-112-9/+15
| |\ \ \ \ | | |/ / /
| | * | | am 46dbed4e: Ignore unreadable TLVs during LLCP activation and CONNECT/CC.Sylvain Fonteneau2011-04-082-9/+15
| | |\ \ \ | | | |/ /
| | | * | Ignore unreadable TLVs during LLCP activation and CONNECT/CC.Sylvain Fonteneau2011-04-082-9/+15
| | | |/
* | | | am e7ace88c: am 353aa40c: am b7e67c8d: Handle correctly LLCP aggregated frames.Sylvain Fonteneau2011-04-051-5/+8
|\ \ \ \ | |/ / /
| * | | am 353aa40c: am b7e67c8d: Handle correctly LLCP aggregated frames.Sylvain Fonteneau2011-04-041-5/+8
| |\ \ \ | | |/ /
| | * | am b7e67c8d: Handle correctly LLCP aggregated frames.Sylvain Fonteneau2011-04-041-5/+8
| | |\ \ | | | |/
| | | * Handle correctly LLCP aggregated frames.Sylvain Fonteneau2011-03-311-5/+8
* | | | am 751f76d7: am 905172d7: am 00c98d51: Disable P2P target 106 passive mode.Nick Pelly2011-03-184-6/+7
|\ \ \ \ | |/ / /
| * | | am 905172d7: am 00c98d51: Disable P2P target 106 passive mode.Nick Pelly2011-03-184-6/+7
| |\ \ \ | | |/ /
| | * | am 00c98d51: Disable P2P target 106 passive mode.Nick Pelly2011-03-184-6/+7
| | |\ \ | | | |/
| | | * Disable P2P target 106 passive mode.Nick Pelly2011-03-184-6/+7
* | | | external/libnfc-nxp: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-2/+2
|/ / /
* | | am 68ffddd6: am d625fb63: Minor tweaks.Jeff Hamilton2011-03-142-2/+1
|\ \ \ | |/ /
| * | am d625fb63: Minor tweaks.Jeff Hamilton2011-03-122-2/+1
| |\ \ | | |/