packages_apps_nfc.git - packages/apps/nfc

	Commit message (Expand)	Author	Age	Files	Lines
*	am 91ebf1e2: am 0f2b555f: Don\'t use NPP for connection handover.	Martijn Coenen	2012-05-21	1	-1/+5
\|\
\| *	am 0f2b555f: Don\'t use NPP for connection handover.	Martijn Coenen	2012-05-18	1	-1/+5
\| \|\
\| \| *	Don't use NPP for connection handover.	Martijn Coenen	2012-05-18	1	-1/+5
* \| \|	am e769540a: am 1179ee22: Merge "Close NFCEE when NFC is being shut down." in...	Martijn Coenen	2012-05-21	1	-1/+9
\|\ \ \ \| \|/ /
\| * \|	am 1179ee22: Merge "Close NFCEE when NFC is being shut down." into jb-dev	Martijn Coenen	2012-05-17	1	-1/+9
\| \|\ \ \| \| \|/
\| \| *	Merge "Close NFCEE when NFC is being shut down." into jb-dev	Martijn Coenen	2012-05-17	1	-1/+9
\| \| \|\
\| \| \| *	Close NFCEE when NFC is being shut down.	Martijn Coenen	2012-05-17	1	-1/+9
* \| \| \|	am 0b610930: am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers...	Martijn Coenen	2012-05-21	5	-30/+111
\|\ \ \ \ \| \|/ / /
\| * \| \|	am 2aa9b461: Merge "Allow cancelling of Bluetooth Beam transfers." into jb-dev	Martijn Coenen	2012-05-17	5	-30/+111
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Allow cancelling of Bluetooth Beam transfers." into jb-dev	Martijn Coenen	2012-05-17	5	-30/+111
\| \| \|\ \ \| \| \| \|/
\| \| \| *	Allow cancelling of Bluetooth Beam transfers.	Martijn Coenen	2012-05-16	5	-30/+111
* \| \| \|	am c9f617a9: am b0f96e9d: Merge "Eliminate obsolete flag." into jb-dev	Craig Mautner	2012-05-21	1	-1/+0
\|\ \ \ \ \| \|/ / /
\| * \| \|	am b0f96e9d: Merge "Eliminate obsolete flag." into jb-dev	Craig Mautner	2012-05-17	1	-1/+0
\| \|\ \ \ \| \| \|/ /
\| \| * \|	Merge "Eliminate obsolete flag." into jb-dev	Craig Mautner	2012-05-17	1	-1/+0
\| \| \|\ \
\| \| \| * \|	Eliminate obsolete flag.	Craig Mautner	2012-05-17	1	-1/+0
* \| \| \| \|	am 8baa9162: am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-fil...	Martijn Coenen	2012-05-17	4	-66/+288
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-file transfers."...	Martijn Coenen	2012-05-16	4	-66/+288
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-dev	Martijn Coenen	2012-05-16	4	-66/+288
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| / \| \| \| \|/
\| \| \| *	Bluetooth Beam handover: deal with multi-file transfers.	Martijn Coenen	2012-05-15	4	-66/+288
* \| \| \|	resolved conflicts for merge of c989f25d to master	Justin Koh	2012-05-17	1	-20/+33
\|\ \ \ \
\| * \| \| \|	Don't instantiate sendUi in Nfc if we are in appliance mode.	Justin Koh	2012-05-17	1	-20/+33
* \| \| \| \|	am 2e0f3b1a: Reconcile with jb-release nakasi-factoryrom-release	The Android Open Source Project	2012-05-16	0	-0/+0
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| \| \| \|
\| \| \ \ \
\| *-. \ \ \	Reconcile with jb-release nakasi-factoryrom-release	The Android Open Source Project	2012-05-16	0	-0/+0
\| \|\ \ \ \ \
\| \| \| * \ \ \	merge in nakasi-factoryrom-release history after reset to jb-dev	The Android Automerger	2012-05-16	0	-0/+0
\| \| \| \|\ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
\| \| \| \| * \| \|	merge in nakasi-factoryrom-release history after reset to jb-dev	The Android Automerger	2012-05-15	0	-0/+0
\| \| \| \| \|\ \ \
\| \| * \| \| \ \ \	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-05-16	0	-0/+0
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \|	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-05-15	0	-0/+0
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \|/\| / / / \| \| \| \| \|/ / /
\| \| \| \| * \| \|	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-05-14	0	-0/+0
\| \| \| \| \|\ \ \ \| \| \| \| \| \|_\|/ \| \| \| \| \|/\| \|
\| \| \| \| \| * \|	Bluetooth Beam bug fixes, UX and i18n.	Martijn Coenen	2012-05-11	6	-113/+307
\| \| \| \| \| * \|	Call right Bluetooth enable API.	Martijn Coenen	2012-05-11	1	-1/+1
\| \| \| \| \| * \|	merge in jb-release history after reset to jb-dev	The Android Automerger	2012-04-25	0	-0/+0
\| \| \| \| \| \|\ \
\| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-04-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-17	0	-0/+0
\| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-04-16	0	-0/+0
\| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-04-09	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| * \|	Force bluetooth OPP to handle ACTION_SEND.	Martijn Coenen	2012-04-05	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| * \|	merge in jb-release history after reset to master	The Android Automerger	2012-04-05	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-04-04	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-04-02	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-03-29	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-03-26	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-03-07	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-28	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-02-16	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-02-14	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-02-13	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\ \
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| * \	merge in jb-release history after reset to master	The Android Automerger	2012-02-02	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|\ \