Merge "Implementation of HCE for NFC-F."

author Martijn Coenen <maco@google.com>

Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)
author Martijn Coenen <maco@google.com>
Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)
diff --cc Android.mk
Simple merge
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/java/android/nfc/NfcAdapter.java
Simple merge
author	Martijn Coenen <maco@google.com>
	Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/nfc/NfcAdapter.java	patch \|	diff1 \|	diff2 \|	blob \| history