packages_apps_nfc.git - packages/apps/nfc

	Commit message (Expand)	Author	Age	Files	Lines
*	am 238cce65: am 69369b77: am 43f22631: Fix type of collision resolution record.	Martijn Coenen	2012-07-25	0	-0/+0
\|\
\| *	am 69369b77: am 43f22631: Fix type of collision resolution record.	Martijn Coenen	2012-07-25	0	-0/+0
\| \|\
\| \| *	am 43f22631: Fix type of collision resolution record.	Martijn Coenen	2012-07-25	1	-1/+3
\| \| \|\
\| \| \| *	Fix type of collision resolution record.	Martijn Coenen	2012-07-25	1	-1/+3
* \| \| \|	am 73eac104: am afa30410: am 327d0e7c: Implement connection handover LLCP ser...	Martijn Coenen	2012-07-25	0	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	am afa30410: am 327d0e7c: Implement connection handover LLCP service.	Martijn Coenen	2012-07-25	0	-0/+0
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am 327d0e7c: Implement connection handover LLCP service.	Martijn Coenen	2012-07-25	6	-7/+414
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Implement connection handover LLCP service.	Martijn Coenen	2012-07-25	6	-7/+414
* \| \| \|	Point jni class references to new dhimpl package.	Martijn Coenen	2012-07-25	7	-20/+20
\|/ / /
* \| \|	Move NXP JNI and DeviceHost implementation into separate dir.	Martijn Coenen	2012-07-25	22	-9/+20
* \| \|	Revert "Move NXP JNI and DeviceHost implementation into separate dir."	Martijn Coenen	2012-07-24	21	-17/+9
* \| \|	Move NXP JNI and DeviceHost implementation into separate dir.	Martijn Coenen	2012-07-24	21	-9/+17
* \| \|	Fix type of collision resolution record.	Martijn Coenen	2012-07-23	1	-1/+3
* \| \|	Merge "Implement connection handover LLCP service."	Martijn Coenen	2012-07-20	6	-7/+414
\|\ \ \
\| * \| \|	Implement connection handover LLCP service.	Martijn Coenen	2012-07-16	6	-7/+414
* \| \| \|	Import translations. DO NOT MERGE	Ying Wang	2012-07-13	1	-3/+3
\|/ / /
* \| \|	am 91e47177: Reconcile with jb-release	The Android Open Source Project	2012-06-19	0	-0/+0
\|\ \ \ \| \|/ /
\| * \|	Reconcile with jb-release	The Android Open Source Project	2012-06-19	0	-0/+0
\| \|\ \
\| \| * \	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-06-19	0	-0/+0
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
* \| \| \|	am 88630509: Reconcile with jb-release	The Android Open Source Project	2012-06-19	0	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Reconcile with jb-release	The Android Open Source Project	2012-06-19	0	-0/+0
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-06-14	0	-0/+0
\| \| \|\ \
* \| \| \ \	am ca6ee0a3: (-s ours) am e926ef2b: Import translations. DO NOT MERGE	Ying Wang	2012-06-18	0	-0/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am e926ef2b: Import translations. DO NOT MERGE	Ying Wang	2012-06-18	1	-1/+1
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Import translations. DO NOT MERGE	Ying Wang	2012-06-18	1	-1/+1
\| \| \|/ /
* \| \| \|	Import translations. DO NOT MERGE	Ying Wang	2012-06-18	1	-1/+1
* \| \| \|	Merge "Import translations. DO NOT MERGE"	Eric Fischer	2012-06-13	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Import translations. DO NOT MERGE	Eric Fischer	2012-06-13	1	-1/+1
* \| \| \| \|	am ee4f8772: (-s ours) am b725b483: Import translations. DO NOT MERGE	Eric Fischer	2012-06-13	0	-0/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| / / / \| \|/ / /
\| * \| \|	am b725b483: Import translations. DO NOT MERGE	Eric Fischer	2012-06-13	1	-1/+1
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Import translations. DO NOT MERGE	Eric Fischer	2012-06-13	1	-1/+1
* \| \| \|	Import translations. DO NOT MERGE	Eric Fischer	2012-06-11	2	-9/+8
* \| \| \|	am eaf1b227: Reconcile with jb-release	The Android Open Source Project	2012-06-11	0	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Reconcile with jb-release	The Android Open Source Project	2012-06-11	0	-0/+0
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-06-11	0	-0/+0
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-06-08	0	-0/+0
\| \| \| \|\
* \| \| \| \	am 7fe56c46: (-s ours) am bce32b5e: Import translations. DO NOT MERGE	Eric Fischer	2012-06-08	0	-0/+0
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am bce32b5e: Import translations. DO NOT MERGE	Eric Fischer	2012-06-08	2	-9/+8
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Import translations. DO NOT MERGE	Eric Fischer	2012-06-08	2	-9/+8
\| \| \|/ /
* \| \| \|	am d694d07b: (-s ours) am c1b34cec: Import translations. DO NOT MERGE	Eric Fischer	2012-06-07	0	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	am c1b34cec: Import translations. DO NOT MERGE	Eric Fischer	2012-06-07	2	-2/+2
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Import translations. DO NOT MERGE	Eric Fischer	2012-06-07	2	-2/+2
* \| \| \|	Import translations. DO NOT MERGE	Eric Fischer	2012-06-07	2	-2/+2
* \| \| \|	am 65cf68da: Reconcile with jb-release	The Android Open Source Project	2012-06-07	0	-0/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	Reconcile with jb-release	The Android Open Source Project	2012-06-07	0	-0/+0
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-06-07	0	-0/+0
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-06-06	0	-0/+0
\| \| \| \|\
\| \| \| \| *	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-06-05	0	-0/+0
\| \| \| \| \|\
\| \| \| \| \| *	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-06-03	0	-0/+0
\| \| \| \| \| \|\
\| \| \| \| \| \| *	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-05-31	0	-0/+0
\| \| \| \| \| \| \|\