Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01

Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f
Merge tag 'android-4.2.1_r1.2' of https://android.googlesource.com/platform/packages/apps/Nfc into HEAD

Android 4.2.1 release 1.2

Conflicts:
	src/com/android/nfc/NfcService.java

Signed-off-by: iceandfire <arhamjamal@gmail.com>