commit 9f0745778cd9923cbb7db06d8f9cbc178a240809
author Martijn Coenen <maco@google.com> Thu Aug 20 12:42:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 20 12:42:40 2015 +0000
tree 9972bb5d1a99298e37e30186bdb6ba15dd799bc5
parent a13efe26f7dda40b7f5ece84adf9482b285e01a3
parent a8158e16d05b154c2f9afe9e54ffaa67d3209833

am a8158e16: Merge "Fix ISO15693 tag crash issue"

* commit 'a8158e16d05b154c2f9afe9e54ffaa67d3209833':
  Fix ISO15693 tag crash issue

src/nfa/dm/nfa_dm_cfg.c

diff --git a/src/nfa/dm/nfa_dm_cfg.c b/src/nfa/dm/nfa_dm_cfg.c
index 9be2163..a6d3173 100644
--- a/src/nfa/dm/nfa_dm_cfg.c
+++ b/src/nfa/dm/nfa_dm_cfg.c
@@ -123,7 +123,6 @@
 tNFA_HCI_CFG *p_nfa_hci_cfg = (tNFA_HCI_CFG *) &nfa_hci_cfg;
 
 BOOLEAN nfa_poll_bail_out_mode = FALSE;
-
 const tNFA_PROPRIETARY_CFG nfa_proprietary_cfg =
 {
     0x80, /* NCI_PROTOCOL_18092_ACTIVE */

src/nfca_version.c

diff --git a/src/nfca_version.c b/src/nfca_version.c
index d415d6f..047cdf4 100644
--- a/src/nfca_version.c
+++ b/src/nfca_version.c
@@ -17,7 +17,7 @@
  ******************************************************************************/
 #include "bt_types.h"
 
-const UINT8 nfca_version_string[] = "NFCDROID-AOSP_L_00.01";
+const UINT8 nfca_version_string[] = "NFCDROID-AOSP_M_00.01";
 
 /*
 // The following string should be manually updated to contain the