summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-08-30Merge "Add support for target-customized NFC stack configuration"tools_r21Martijn Coenen
2012-08-29Merge "HCI ANY_OPEN_PIPE on identity management gate crash fix"Jeff Hamilton
2012-08-29Merge "Support of topaz tag NFC Forum version number 1.1"Jeff Hamilton
2012-08-23Add support for target-customized NFC stack configurationSebastian Niciarz
2012-08-14HCI ANY_OPEN_PIPE on identity management gate crash fixDejan REBRACA
2012-08-14Support of topaz tag NFC Forum version number 1.1Dejan REBRACA
2012-06-19Reconcile with jb-releaseThe Android Open Source Project
2012-06-14Revert "Added addr field in response of Jewel command"android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releasejb-mr0-releaseMartijn Coenen
2012-06-14am 42fef9f8: Revert "Added addr field in response of Jewel command"Martijn Coenen
2012-06-14Revert "Added addr field in response of Jewel command"android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1jb-devMartijn Coenen
2012-06-13merge in jb-release history after reset to jb-devThe Android Automerger
2012-06-12am 144d72d3: Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen
2012-06-12Remove some logs in case of abort() (DO NOT MERGE).Martijn Coenen
2012-05-24Reconcile with jb-releaseThe Android Open Source Project
2012-05-24merge in jb-release history after reset to jb-devThe Android Automerger
2012-05-23am ba040759: Fix wrong extern variable sizeSunil Jogi
2012-05-23Fix wrong extern variable sizeSunil Jogi
2012-05-16Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project
2012-04-23merge in jb-release history after reset to masterThe Android Automerger
2012-04-20Merge "Added recovery function when SE wired mode selected"Martijn Coenen
2012-04-19Add NOTICE and MODULE_LICENSE_APACHE filesWei Zhong
2012-04-19Fix T2T makeReadonly.Martijn Coenen
2012-04-18merge in jb-release history after reset to masterThe Android Automerger
2012-04-17Added addr field in response of Jewel commandSunil Jogi
2012-04-13Added recovery function when SE wired mode selectedSunil Jogi
2012-04-09merge in jb-release history after reset to masterThe Android Automerger
2012-04-02Added support for tearing recovery for MIFARE Classic ReadonlySunil Jogi
2012-04-02Mifare readonly support.Sunil Jogi
2012-04-02Patch to support MIFARE with SAK 0x01Sunil Jogi
2012-03-21Empty merge of a remote-tracking branchMike Lockwood
2012-03-21merge in jb-release history after reset to masterThe Android Automerger
2012-03-20merge in jb-release history after reset to masterThe Android Automerger
2012-03-20merge in jb-release history after reset to masterThe Android Automerger
2012-03-16Don't dump nfc target/initiator modes to system log.Martijn Coenen
2012-03-12merge in jb-release history after reset to masterThe Android Automerger
2012-03-09Replace loge with aloge.Ramanan Rajeswaran
2012-03-09am da7d267e: am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal
2012-03-09am 3f791036: nfc-hal: generalize error handling in Reader thread.Rakesh Goyal
2012-03-09nfc-hal: generalize error handling in Reader thread.Rakesh Goyal
2012-03-08merge in jb-release history after reset to masterThe Android Automerger
2012-03-07am bbda0171: am 65ce3454: Merge "Fix one coding error of using a temporary va...Nick Pelly
2012-03-07am 65ce3454: Merge "Fix one coding error of using a temporary variable in the...Nick Pelly
2012-03-07Merge "Fix one coding error of using a temporary variable in the global struc...android-sdk-adt_r20tools_r20ics-plus-aospNick Pelly
2012-03-06merge in jb-release history after reset to masterThe Android Automerger
2012-03-05Support for handling of proprietry TLV in T4TSunil Jogi
2012-03-05Skip proprietry TLV for Type 2Sunil Jogi
2012-03-05merge in jb-release history after reset to masterThe Android Automerger
2012-03-01Fix one coding error of using a temporary variable in the global structure Nd...Jack Ren
2012-02-17(DEBUG) Add support for setting p2p modes.Martijn Coenen
2012-02-07DO NOT MERGEMike J. Chen