external_libnfc-nxp.git - external/libnfc-nxp

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "card emulation patch port to JB" into jellybean	Steve Kondik	2012-08-31	23	-1565/+5395
\|\
\| *	card emulation patch port to JB	doug yeager	2012-08-28	23	-1565/+5395
* \|	Merge branch 'jb-release' of https://android.googlesource.com/platform/extern...	Steve Kondik	2012-08-10	0	-0/+0
\|\ \ \| \|/ \|/\|
\| *	Revert "Added addr field in response of Jewel command"	Martijn Coenen	2012-06-14	1	-63/+0
\| *	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-06-13	0	-0/+0
\| \|\
\| \| *	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-05-24	0	-0/+0
\| \| \|\
\| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-04-23	0	-0/+0
\| \| \| \|\
\| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-04-18	0	-0/+0
\| \| \| \| \|\
\| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-04-09	0	-0/+0
\| \| \| \| \| \|\
\| \| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-03-21	0	-0/+0
\| \| \| \| \| \| \|\
\| \| \| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-03-20	0	-0/+0
\| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-03-20	0	-0/+0
\| \| \| \| \| \| \| \| \|\ \| \| \| \| \| \| \| \|/ / \| \| \| \| \| \| \|/\| / \| \| \| \| \| \| \| \|/
\| \| \| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-03-12	0	-0/+0
\| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-03-08	0	-0/+0
\| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-03-06	0	-0/+0
\| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-03-05	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-02-07	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-01-31	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| \| \| *	merge in jb-release history after reset to master	The Android Automerger	2012-01-30	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| \| \| \| *	merge in ics-release history after reset to master	The Android Automerger	2012-01-25	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| *	merge in ics-release history after reset to master	The Android Automerger	2012-01-23	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| *	merge in ics-release history after reset to master	The Android Automerger	2012-01-17	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| *	merge in ics-release history after reset to master	The Android Automerger	2012-01-10	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| *	merge in ics-release history after reset to master	The Android Automerger	2012-01-09	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| *	merge in ics-release history after reset to master	The Android Automerger	2012-01-05	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| *	merge in ics-release history after reset to master	The Android Automerger	2011-11-08	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| *	merge in ics-release history after reset to master	The Android Automerger	2011-10-26	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Added addr field in response of Jewel command"	Martijn Coenen	2012-06-14	1	-63/+0
\|/ / / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some logs in case of abort() (DO NOT MERGE).	Martijn Coenen	2012-06-12	1	-4/+2
\|/ / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong extern variable size	Sunil Jogi	2012-05-23	1	-1/+1
\|/ / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge "Added recovery function when SE wired mode selected"	Martijn Coenen	2012-04-20	3	-0/+19
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added recovery function when SE wired mode selected	Sunil Jogi	2012-04-13	3	-0/+19
\| \| \|/ / / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add NOTICE and MODULE_LICENSE_APACHE files	Wei Zhong	2012-04-19	2	-0/+189
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix T2T makeReadonly.	Martijn Coenen	2012-04-19	1	-1/+1
\| \|/ / / / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added addr field in response of Jewel command	Sunil Jogi	2012-04-17	1	-0/+63
\|/ / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added support for tearing recovery for MIFARE Classic Readonly	Sunil Jogi	2012-04-02	3	-14/+16
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mifare readonly support.	Sunil Jogi	2012-04-02	7	-22/+455
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Patch to support MIFARE with SAK 0x01	Sunil Jogi	2012-04-02	5	-4/+9
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Empty merge of a remote-tracking branch	Mike Lockwood	2012-03-21	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DO NOT MERGE	Mike J. Chen	2012-02-07	1	-0/+5
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am b99be65c: Use NFC HAL for some libnfc settings.	Martijn Coenen	2011-11-07	6	-114/+56
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	keep previous history after reset to mr1 plus aah changes (ics-aah-wip)	Ed Heyl	2011-10-28	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	undo reset to ics-mr1 until we have a better method	Ed Heyl	2011-10-26	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	reset to ics-mr1, but keep history	Ed Heyl	2011-10-26	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / / / / \| \|/\| / / / / / / / / / / / / / / / / / \| \| \|/ / / / / / / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am 36623817: Merge remote branch \'goog/ics-mr0\' into ics-mr1	Ed Heyl	2011-10-26	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am b13b27aa: Use a 10s timeout in uart_read() in FW download mode.	Nick Pelly	2011-10-26	2	-2/+6
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	am ff39bc6d: (-s ours) am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaroun...	Martijn Coenen	2011-10-21	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't dump nfc target/initiator modes to system log.	Martijn Coenen	2012-03-16	1	-2/+2
\| \|_\|_\|_\|_\|/ / / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace loge with aloge.	Ramanan Rajeswaran	2012-03-09	1	-1/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am da7d267e: am 3f791036: nfc-hal: generalize error handling in Reader thread.	Rakesh Goyal	2012-03-09	1	-5/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|