commit 0dae019b3b8118412193d04c9491cf3dd527c5ba
author android-build-team Robot <android-build-team-robot@google.com> Thu Aug 17 06:12:14 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Aug 17 06:12:14 2017 +0000
tree e98048f48b8fa0f92c75ab5e883c6219a717c2b5
parent 93d1a3c972d83baf281b66c7f8226bc3c72941bc
parent 6e2338f297d3254b8b72afc197e6ad51f23e271a

Merge cherrypicks of [2747421, 2747423, 2747425, 2747426, 2747427, 2747428, 2747429, 2747430, 2746683, 2746684, 2746685, 2747431, 2747432, 2747433, 2747434, 2747291, 2747435, 2743617] into oc-dr1-release

Change-Id: I38cce713d451122bb65d2c0572ffd5d7c2e7adb9

nfc/libnfc-nxp.muskie.conf

diff --git a/nfc/libnfc-nxp.muskie.conf b/nfc/libnfc-nxp.muskie.conf
index 9e13ceb..90078e5 100644
--- a/nfc/libnfc-nxp.muskie.conf
+++ b/nfc/libnfc-nxp.muskie.conf
@@ -151,7 +151,7 @@
 # UICC2 bit rate A0D1
 # SWP1A interface A0D4
 # DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037
-NXP_CORE_CONF_EXTN={20, 02, 29, 0E,
+NXP_CORE_CONF_EXTN={20, 02, 44, 0E,
     A0, EC, 01, 01,
     A0, ED, 01, 01,
     A0, 5E, 01, 01,