summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/ex...Steve Kondik2012-12-271-0/+5
|\
| * Add support for target-customized NFC stack configurationSebastian Niciarz2012-08-231-0/+5
* | card emulation patch port to JBdoug yeager2012-08-281-8/+9
|/
* Use NFC HAL for some libnfc settings.Martijn Coenen2011-11-031-1/+1
* Manual port of 6900b4 from gingerbread:Rob von Behren2011-09-201-1/+1
* Add the ability to enable LLCP logging.Jeff Hamilton2011-07-261-0/+6
* libnfc spring cleaningNick Pelly2011-06-271-26/+11
* Misc changes for Nexus Prime bringup.Nick Pelly2011-06-141-1/+1
* am 5d96b2d2: am 5a9fc269: Properly merge \'Patch to enable low level traces.\'Daniel Tomas2011-06-021-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-241-0/+6
|\ \ | |/
| * Merge from gingerbreadJean-Baptiste Queru2011-05-231-0/+6
| |\
| | * Patch to enable low level traces.Daniel Tomas2011-05-191-0/+4
* | | external/libnfc-nxp: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-2/+2
|/ /
* | am 4f3ef022: Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-241-0/+1
|\ \ | |/
| * Support formatting / makeReadOnly() of NDEF on ICODE.Martijn Coenen2011-02-251-0/+1
* | am a6e012a7: Added support for NDEF on ICODE.Martijn Coenen2011-02-241-0/+1
|\ \ | |/
| * Added support for NDEF on ICODE.Martijn Coenen2011-02-251-0/+1
* | Merge 064d3925 from open-source masterJean-Baptiste Queru2010-12-291-1/+5
|\ \ | |/ |/|
| * Don't set ARM flags for non arm buildsBruce Beare2010-12-261-1/+5
* | Download feature added in the libnfcdaniel_Tomas2010-12-091-3/+6
|/
* Assign names to reader and writer thread so its easier to debug them.Nick Pelly2010-10-271-0/+1
* NFC: Move NFC service jni from external/libnfc-nxp to packages/apps/Nfc.Nick Pelly2010-10-151-5/+24
* Modify Android.mk for JNI.Nick Pelly2010-09-281-0/+2
* Cleanup Android.mkNick Pelly2010-09-241-3/+2
* Initial libnfc checkinNick Pelly2010-09-231-0/+126