Merge branch 'jb-release' of https://android.googlesource.com/platform/external/libnfc-nxp into aosp
card emulation patch port to JB

Change-Id: I86657f9c547840de33c35df4912b5f282d4fe459
Merge "card emulation patch port to JB" into jellybean
On some handsets, there is a configuration of hardware that causes a conflict with HCE.  Primarily it is something in the SWP configuration with a SWP sim card.  It appears to be a PN544 register setting that blocks HCE type A only from initialization.  This patch checks for this conflict and disables HCE for those configurations.  The better way would be to understand how to set the PN544 registers to unblock the conflict, but this is a sufficient work around for this minority of configurations

Change-Id: I64d79acaa7eb58e15f1fb4bbe298883036f6d45a
Merge "On some handsets, there is a configuration of hardware that causes a conflict with HCE.  Primarily it is something in the SWP configuration with a SWP sim card.  It appears to be a PN544 register setting that blocks HCE type A only from initialization.  This patch checks for this conflict and disables HCE for those configurations.  The better way would be to understand how to set the PN544 registers to unblock the conflict, but this is a sufficient work around for this minority of configurations" into jellybean
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/libnfc-nxp into aosp

Conflicts:
	src/phHal4Nfc_ADD.c

Change-Id: I950a66598954d21b49f723da2c58bff2ba719239
libnfc-nxp: Add alternate firmware path

 * Check in /system/lib for firmware as well, so we can be bug-for-bug
   compatible with OEMs.

Change-Id: Iea350c3d0a58a1f6012c2a088f8ba6fed4b10365
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/libnfc-nxp into 1.1

Android 4.2.2 release 1
Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1
Merge tag 'android-4.4_r1' into cm-11.0

Android 4.4 Release 1.0