summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * 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
| | |\
* | | \ 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
| |\ \ \
| | * | | 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() (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
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-240-0/+0
| |\ \ | | |/ | |/|
* | | am ba040759: Fix wrong extern variable sizeSunil Jogi2012-05-231-1/+1
|\ \ \ | |/ /
| * | 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 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
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-300-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-250-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-230-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-170-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-100-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-090-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2012-01-050-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-11-080-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-260-0/+0
| | | | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | | | \ Merge "Added recovery function when SE wired mode selected"Martijn Coenen2012-04-203-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Added recovery function when SE wired mode selectedSunil Jogi2012-04-133-0/+19
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
generated by cgit v1.1 at 2025-01-03 17:44:43 +0000