summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-08-04Merge "Fix conflict vendor proprietary Protocol and Discovery technology defi...android-m-preview-2Martijn Coenen
2015-08-03Fix conflict vendor proprietary Protocol and Discovery technology definitionsJizhou Liao
2015-08-03Merge "Add Peer-To-Peer priority mechanism"Martijn Coenen
2015-08-03Merge "ISO-DEP presence check workaround"Martijn Coenen
2015-07-31Add Peer-To-Peer priority mechanismJizhou Liao
2015-07-29ISO-DEP presence check workaroundJizhou Liao
2015-07-23Merge "Avoid routing table update if nothing changed."Martijn Coenen
2015-07-13Merge "Update customized settings to eeprom after firmware download"Martijn Coenen
2015-07-13Merge "T1T HR0 and HR1 parameters missing in tag dectection"Martijn Coenen
2015-07-13Merge "Memory leak and NULL pointer check fixes"Martijn Coenen
2015-07-10Memory leak and NULL pointer check fixesJizhou Liao
2015-07-10T1T HR0 and HR1 parameters missing in tag dectectionJizhou Liao
2015-06-29Update customized settings to eeprom after firmware downloadJizhou Liao
2015-06-29Avoid routing table update if nothing changed.Jizhou Liao
2015-06-29Merge "Add NFC-DEP routing"android-m-preview-1Martijn Coenen
2015-06-17Add NFC-DEP routingJizhou Liao
2015-05-20Merge "Adding NXP NCI Hal implementation"android-m-previewMartijn Coenen
2015-05-19Adding NXP NCI Hal implementationJizhou Liao
2015-04-16Merge "Fix <string.h> include."master-soongMartijn Coenen
2015-04-16Fix <string.h> include.Martijn Coenen
2015-04-16Merge "Bump LLCP version to 1.2"Martijn Coenen
2015-04-16Merge "Add system prop for enabling protocol logging"Martijn Coenen
2015-04-15Bump LLCP version to 1.2Martijn Coenen
2015-04-15Add system prop for enabling protocol loggingAndres Morales
2015-03-18Merge "Add NOTICE and MODULE_LICENSE"android-wear-5.1.1_r1android-wear-5.1.0_r1Conley Owens
2015-03-12Add NOTICE and MODULE_LICENSEConley Owens
2015-01-30am 33fc4b74: Merge "Add missing includes."Elliott Hughes
2015-01-30Merge "Add missing includes."Elliott Hughes
2015-01-29Add missing includes.Elliott Hughes
2015-01-28am 734ebfac: Merge "Add missing includes."Elliott Hughes
2015-01-28Merge "Add missing includes."Elliott Hughes
2015-01-28Add missing includes.Elliott Hughes
2014-12-16am 9e3ff8f6: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
2014-12-16Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
2014-12-16Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang
2014-11-17am 97dff702: Merge "Move libnfc-nci to libc++."Dan Albert
2014-11-17Merge "Move libnfc-nci to libc++."android-wear-5.0.0_r1lollipop-wear-releaseDan Albert
2014-11-15Move libnfc-nci to libc++.Dan Albert
2014-10-26am 26617dd4: am 90186191: Merge "Don\'t set a pthread_t to NULL"Martijn Coenen
2014-10-26am 25318f32: am 4b981bc8: Merge "Fix Clang compilation errors."Chih-Hung Hsieh
2014-10-26am 324f25d9: am ed2d14c1: Merge "Fix null pointer dereference." into lmp-devMartijn Coenen
2014-10-26am c2e8691c: resolved conflicts for merge of efd44c45 to lmp-dev-plus-aospDan Albert
2014-10-20am 90186191: Merge "Don\'t set a pthread_t to NULL"Martijn Coenen
2014-10-20am 90186191: Merge "Don\'t set a pthread_t to NULL"Martijn Coenen
2014-10-20Merge "Don't set a pthread_t to NULL"Martijn Coenen
2014-10-10am 4b981bc8: Merge "Fix Clang compilation errors."Chih-Hung Hsieh
2014-10-10am 4b981bc8: Merge "Fix Clang compilation errors."Chih-Hung Hsieh
2014-10-10Merge "Fix Clang compilation errors."android-l-preview_r2l-previewChih-Hung Hsieh
2014-10-10Fix Clang compilation errors.Chih-Hung Hsieh
2014-10-02Don't set a pthread_t to NULLBernhard Rosenkraenzer
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 11:20:56 +0000