Merge "Address API review comments." into nyc-dev am: 9a32929def

author Martijn Coenen <maco@google.com>

Mon, 16 May 2016 09:29:02 +0000 (09:29 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 16 May 2016 09:29:02 +0000 (09:29 +0000)
author Martijn Coenen <maco@google.com>
Mon, 16 May 2016 09:29:02 +0000 (09:29 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 09:29:02 +0000 (09:29 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc core/java/android/nfc/cardemulation/NfcFCardEmulation.java
Simple merge
author	Martijn Coenen <maco@google.com>
	Mon, 16 May 2016 09:29:02 +0000 (09:29 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 16 May 2016 09:29:02 +0000 (09:29 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/nfc/cardemulation/NfcFCardEmulation.java	patch \|	diff1 \|	diff2 \|	blob \| history