summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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 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 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
* | | 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
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Add NOTICE and MODULE_LICENSE_APACHE filesWei Zhong2012-04-192-0/+189
* | | | | | | | | | | | | | | | | | | | Fix T2T makeReadonly.Martijn Coenen2012-04-191-1/+1
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Added addr field in response of Jewel commandSunil Jogi2012-04-171-0/+63
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Added support for tearing recovery for MIFARE Classic ReadonlySunil Jogi2012-04-023-14/+16
* | | | | | | | | | | | | | | | | | Mifare readonly support.Sunil Jogi2012-04-027-22/+455
* | | | | | | | | | | | | | | | | | Patch to support MIFARE with SAK 0x01Sunil Jogi2012-04-025-4/+9
* | | | | | | | | | | | | | | | | | Empty merge of a remote-tracking branchMike Lockwood2012-03-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | DO NOT MERGEMike J. Chen2012-02-071-0/+5
| * | | | | | | | | | | | | | | | | am b99be65c: Use NFC HAL for some libnfc settings.Martijn Coenen2011-11-076-114/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am 36623817: Merge remote branch \'goog/ics-mr0\' into ics-mr1Ed Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |