Merge remote-tracking branch 'tizen_2.2' into tizen

Conflicts:
	CMakeLists.txt
	TC/testcase/utc_network_nfc_ndef_message.c
	TC/testcase/utc_network_nfc_ndef_record.c
	include/nfc.h
	include/nfc_private.h
	packaging/capi-network-nfc.spec
	src/nfc.c

Change-Id: I8305909825fbb52827495c8d451f2adbbcc18e90

diff --cc TC/testcase/utc_network_nfc_ndef_message.c
index 6795f77,84d2265..0c5b101
mode 100644,100755..100644
--- 1/TC/testcase/utc_network_nfc_ndef_message.c
--- 2/TC/testcase/utc_network_nfc_ndef_message.c
+++ b/TC/testcase/utc_network_nfc_ndef_message.c
@@@ -83,31 -89,28 +83,31 @@@ static void cleanup(void
        /* end of TC */
  }
  
 -
  static void utc_nfc_ndef_message_create_p(void)
  {
 -      int ret ;
 +      int ret;
        nfc_ndef_message_h message;
 +
        ret = nfc_ndef_message_create(&message);
 -      MY_ASSERT(__func__ , ret == NFC_ERROR_NONE , "FAIL");
        nfc_ndef_message_destroy(message);
 -      dts_pass(__func__, "PASS");
 +
 +      dts_check_eq(__func__, ret, NFC_ERROR_NONE, "nfc_ndef_message_create is failed");
  }
 +
  static void utc_nfc_ndef_message_create_n(void)
  {
 -      int ret ;
 +      int ret;
 +
        ret = nfc_ndef_message_create(NULL);
 -      MY_ASSERT(__func__,  ret != NFC_ERROR_NONE , "FAIL");
 -      dts_pass(__func__, "PASS");
 +
 +      dts_check_ne(__func__, ret, NFC_ERROR_NONE, "nfc_ndef_message_create not allow null");
  }
 +
  static void utc_nfc_ndef_message_create_from_rawdata_p(void)
  {
 -      int ret ;
 +      int ret;
        unsigned char *buffer;
-       uint32_t int size;
+       uint32_t size;
        nfc_ndef_message_h message;
        nfc_ndef_message_h message2;
        nfc_ndef_record_h record1;

diff --cc TC/testcase/utc_network_nfc_ndef_record.c
index 72d4c75,8ac2ec2..0c386db
mode 100644,100755..100644
--- 1/TC/testcase/utc_network_nfc_ndef_record.c
--- 2/TC/testcase/utc_network_nfc_ndef_record.c
+++ b/TC/testcase/utc_network_nfc_ndef_record.c
@@@ -300,15 -251,12 +300,15 @@@ static void utc_nfc_ndef_record_get_id_
  static void utc_nfc_ndef_record_get_id_n(void)
  {
        int ret;
 -      ret = nfc_ndef_record_get_id(NULL,NULL, NULL);
 +
 +      ret = nfc_ndef_record_get_id(NULL, NULL, NULL);
 +
        dts_check_ne(__func__, ret, NFC_ERROR_NONE, "nfc_ndef_record_h not allow null");
  }
 +
  static void utc_nfc_ndef_record_get_payload_p(void)
  {
-       int ret;
+       int ret = 0;
        uint32_t size;
        nfc_ndef_record_h record;
        unsigned char *payload;

diff --cc include/nfc.h
index 3e186d8,5871967..0b2c5ac
mode 100644,100755..100644
--- 1/include/nfc.h
--- 2/include/nfc.h
+++ b/include/nfc.h

diff --cc src/nfc.c
index 860ce58,5f0ba6c..860ce58
mode 100644,100755..100755
--- 1/src/nfc.c
--- 2/src/nfc.c
+++ b/src/nfc.c

diff --cc test/network_nfc_test.c
index 0882e6d,ac64c77..f5da0ac
mode 100644,100755..100644
--- 1/test/network_nfc_test.c
--- 2/test/network_nfc_test.c
+++ b/test/network_nfc_test.c