commit 9253ed14922b27df55bddc3bc4d9c2379bcaa42e
author Martijn Coenen <maco@google.com> Fri Aug 07 10:01:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 07 10:01:56 2015 +0000
tree b5ba277292b3c65679b7e416ba7284f2568a28ce
parent acb10eca6be7ebf130e58bcb704ffab936d36658
parent 687512f08bd0779607e5d130181fab58cfc4c66b

am 687512f0: Merge "Bump libnfc-nci version for M." into mnc-dr-dev

* commit '687512f08bd0779607e5d130181fab58cfc4c66b':
  Bump libnfc-nci version for M.

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