platform_packages_apps_Nfc - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge "Fix NPE in isForegroundAllowedLocked()"android-o-preview-1 o-preview	Treehugger Robot	2017-03-07	1	-2/+6
\|\
\| *	Fix NPE in isForegroundAllowedLocked()	Hiroki Yamamoto	2017-03-06	1	-2/+6
\|/
*	Merge "Beam: aim intents directly to com.android.bluetooth"	Treehugger Robot	2017-02-14	2	-0/+6
\|\
\| *	Beam: aim intents directly to com.android.bluetooth	Marie Janssen	2017-02-13	2	-0/+6
\|/
*	Merge "Use _OverrideLog.h instead of OverrideLog.h"	Ruchi Kandoi	2017-02-03	12	-12/+12
\|\
\| *	Use _OverrideLog.h instead of OverrideLog.h	Ruchi Kandoi	2017-01-30	12	-12/+12
* \|	Merge "Fix screen state control when user switched"	Treehugger Robot	2017-01-25	1	-0/+4
\|\ \
\| * \|	Fix screen state control when user switched	Hiroki Yamamoto	2016-09-01	1	-0/+4
* \| \|	Merge "Set BiDi(Arabic/Farsi/Hebrew) content to be from right to left"	Ruchi Kandoi	2017-01-20	1	-0/+1
\|\ \ \
\| * \| \|	Set BiDi(Arabic/Farsi/Hebrew) content to be from right to left	Hongliang Zhou	2016-12-14	1	-0/+1
* \| \| \|	Merge "Query foreground service preference for specific users"	Treehugger Robot	2017-01-20	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Query foreground service preference for specific users	Akinobu Nakashima	2017-01-20	1	-2/+2
* \| \| \| \|	Merge "Enable P2P listening even Android Beam is disabled"	Treehugger Robot	2017-01-20	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Enable P2P listening even Android Beam is disabled	Kui Wang	2016-10-12	1	-1/+1
* \| \| \| \| \|	Merge "Prepare for removal of legacy-test from default targets"	Treehugger Robot	2017-01-18	1	-0/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	Prepare for removal of legacy-test from default targets	Paul Duffin	2017-01-17	1	-0/+1
\|/ / / / /
* \| \| \| \|	Merge changes from topic 'nfc-data-type-changes'android-n-mr2-preview-1	Ruchi Kandoi	2017-01-11	26	-469/+469
\|\ \ \ \ \
\| * \| \| \| \|	nfc: Change the data type in log messages to match the new types.	Ruchi Kandoi	2016-12-14	2	-4/+4
\| * \| \| \| \|	Changes TRUE/FALSE to true/false	Ruchi Kandoi	2016-12-14	3	-52/+52
\| * \| \| \| \|	Changes data types to standard type	Ruchi Kandoi	2016-12-14	25	-417/+417
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge "liblog: use log/log.h to access main logging macros"	Treehugger Robot	2017-01-10	9	-6/+12
\|\ \ \ \ \
\| * \| \| \| \|	liblog: use log/log.h to access main logging macros	Mark Salyzyn	2017-01-10	9	-6/+12
\|/ / / / /
* \| \| \| \|	Merge "Separate Bluetooth handover failed and not supported cases during P2P"	Treehugger Robot	2017-01-07	1	-1/+4
\|\ \ \ \ \
\| * \| \| \| \|	Separate Bluetooth handover failed and not supported cases during P2P	Ruchi Kandoi	2017-01-07	1	-1/+4
\|/ / / / /
* \| \| \| \|	Merge "payment: Do not reset the default payment is non-null."	Ruchi Kandoi	2017-01-06	1	-43/+1
\|\ \ \ \ \
\| * \| \| \| \|	payment: Do not reset the default payment is non-null.	Ruchi Kandoi	2016-12-29	1	-43/+1
\|/ / / / /
* \| \| \| \|	Merge "Android Beam: Shows Toast for all users"	Treehugger Robot	2016-12-28	1	-1/+3
\|\ \ \ \ \
\| * \| \| \| \|	Android Beam: Shows Toast for all users	Akinobu Nakashima	2016-12-28	1	-1/+3
\|/ / / / /
* \| \| \| \|	Merge "Android Beam: Check for empty intent to avoid crash"	Treehugger Robot	2016-12-22	1	-1/+2
\|\ \ \ \ \
\| * \| \| \| \|	Android Beam: Check for empty intent to avoid crash	Ruchi Kandoi	2016-12-21	1	-1/+2
\|/ / / / /
* \| \| \| \|	Merge "NFC: Move playSound to BeamManager"	Treehugger Robot	2016-12-22	3	-39/+23
\|\ \ \ \ \
\| * \| \| \| \|	NFC: Move playSound to BeamManager	Atsushi Suga	2016-12-21	3	-39/+23
\|/ / / / /
* \| \| \| \|	Merge "Adds functionality to detect live case NFC tags on lock screen."	Treehugger Robot	2016-12-21	3	-7/+101
\|\ \ \ \ \
\| * \| \| \| \|	Adds functionality to detect live case NFC tags on lock screen.	Ruchi Kandoi	2016-12-19	3	-7/+101
\| \|/ / / /
* \| \| \| \|	Merge "Adds android.nfc.tech.ndef to unformatted NFC tags"	Treehugger Robot	2016-12-15	1	-2/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Adds android.nfc.tech.ndef to unformatted NFC tags	Ruchi Kandoi	2016-12-14	1	-2/+8
\|/ / / /
* \| \| \|	Merge "Use FileProvider rather than sharing raw file URI"	Ruchi Kandoi	2016-12-06	4	-2/+20
\|\ \ \ \
\| * \ \ \	Merge "Use FileProvider rather than sharing raw file URI"	Ruchi Kandoi	2016-12-06	4	-2/+20
\| \|\ \ \ \
\| \| * \| \| \|	Use FileProvider rather than sharing raw file URI	Johan Redestig	2016-12-02	4	-2/+20
* \| \| \| \| \|	Merge "Fix unresponsive touch screen after NFC WPS dialog is closed"	xin.li	2016-12-06	1	-0/+1
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge "Fix unresponsive touch screen after NFC WPS dialog is closed"	Treehugger Robot	2016-12-06	1	-0/+1
\| \|\\| \| \| \|
\| \| * \| \| \|	Fix unresponsive touch screen after NFC WPS dialog is closed	xin.li	2016-12-02	1	-0/+1
\| \|/ / / /
* \| \| \| \|	Merge "Android.mk: Change the source directory to point to new location."	Ruchi Kandoi	2016-11-29	1	-1/+1
\|\\| \| \| \|
\| * \| \| \|	Merge "Android.mk: Change the source directory to point to new location."	Ruchi Kandoi	2016-11-29	1	-1/+1
\| \|\ \ \ \
\| \| * \| \| \|	Android.mk: Change the source directory to point to new location.	Ruchi Kandoi	2016-11-22	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Import translations. DO NOT MERGE	Bill Yi	2016-11-20	77	-498/+190
* \| \| \| \|	Merge "BLE OOB Pairing - parse address type (4/5)"	Jakub Pawlowski	2016-11-10	1	-0/+9
\|\\| \| \| \|
\| * \| \| \|	Merge "BLE OOB Pairing - parse address type (4/5)"	Treehugger Robot	2016-11-10	1	-0/+9
\| \|\ \ \ \
\| \| * \| \| \|	BLE OOB Pairing - parse address type (4/5)	Jakub Pawlowski	2016-11-09	1	-0/+9
\| \|/ / / /
* \| \| \| \|	Merge "NFC: Remove obsolete nxp code."	Ruchi Kandoi	2016-10-31	18	-7774/+0
\|\\| \| \| \|