Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01

Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/packages/apps/Nfc into aosp

Conflicts:
	nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
	src/com/android/nfc/NfcService.java

Change-Id: I52a73c696c003e8ccf513977968a42d917acf87a
NFC polling mode (1/3)

Signed-off-by: sethyx <sethyx@gmail.com>