merge branch tizen_3.0 to tizen

Change-Id: I3d3e2ba549f2331126166f8c379a0c690df34163
Signed-off-by: Jongkyu Koo <jk.koo@samsung.com>

diff --cc include/contacts_db.h
index ccbfffb,c95ebf0..11d4148
--- 1/include/contacts_db.h
--- 2/include/contacts_db.h
+++ b/include/contacts_db.h
@@@ -16,6 -16,8 +16,8 @@@
   * limitations under the License.
   *
   */
 - 
 - 
++
++
  #ifndef __TIZEN_SOCIAL_CONTACTS_DB_H__
  #define __TIZEN_SOCIAL_CONTACTS_DB_H__
  
@@@ -30,7 -32,6 +32,7 @@@ extern "C
   * @file contacts_db.h
   */
  
-  
++
  /**
   * @ingroup CAPI_SOCIAL_CONTACTS_SVC_MODULE
   * @defgroup CAPI_SOCIAL_CONTACTS_SVC_DATABASE_MODULE Database

diff --cc include/contacts_db_status.h
index eb8d133,63bf7a5..327a47a
--- 1/include/contacts_db_status.h
--- 2/include/contacts_db_status.h
+++ b/include/contacts_db_status.h
@@@ -16,8 -16,8 +16,8 @@@
   * limitations under the License.
   *
   */
-- 
-- 
++
++
  #ifndef __TIZEN_SOCIAL_CONTACTS_DB_STATUS_H__
  #define __TIZEN_SOCIAL_CONTACTS_DB_STATUS_H__
  
@@@ -32,13 -32,13 +32,13 @@@ extern "C
   * @file contacts_db_status.h
   */
  
-- 
++
  /**
   * @addtogroup CAPI_SOCIAL_CONTACTS_SVC_DATABASE_MODULE
   * @{
   */
  
-- 
++
  /**
   * @brief Enumeration for contact DB status.
   * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 3.0 @endif
@@@ -111,7 -110,7 +110,7 @@@ int contacts_db_remove_status_changed_c
   * @}
   */
  
-- 
++
  #ifdef __cplusplus
  }
  #endif

diff --cc include/contacts_filter.h
index d5055ef,a50e093..48d98ac
--- 1/include/contacts_filter.h
--- 2/include/contacts_filter.h
+++ b/include/contacts_filter.h
@@@ -16,8 -16,8 +16,8 @@@
   * limitations under the License.
   *
   */
-- 
-- 
++
++
  #ifndef __TIZEN_SOCIAL_CONTACTS_FILTER_H__
  #define __TIZEN_SOCIAL_CONTACTS_FILTER_H__
  
@@@ -32,7 -32,7 +32,7 @@@ extern "C
   * @file contacts_filter.h
   */
  
-- 
++
  /**
   * @ingroup CAPI_SOCIAL_CONTACTS_SVC_MODULE
   * @defgroup CAPI_SOCIAL_CONTACTS_SVC_FILTER_MODULE Filter
@@@ -43,7 -43,7 +43,7 @@@
   * @{
   */
  
-- 
++
  /**
   * @brief Enumeration for Contacts match string flags.
   * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 3.0 @endif
@@@ -233,7 -232,7 +232,7 @@@ int contacts_filter_add_filter(contacts
   * @}
   */
  
-- 
++
  #ifdef __cplusplus
  }
  #endif

diff --cc include/contacts_list.h
Simple merge

diff --cc include/contacts_person.h
index 303cce1,eec8887..f71636d
--- 1/include/contacts_person.h
--- 2/include/contacts_person.h
+++ b/include/contacts_person.h
@@@ -16,8 -16,8 +16,8 @@@
   * limitations under the License.
   *
   */
-- 
-- 
++
++
  #ifndef __TIZEN_SOCIAL_CONTACTS_PERSON_H__
  #define __TIZEN_SOCIAL_CONTACTS_PERSON_H__
  
@@@ -32,7 -32,7 +32,7 @@@ extern "C
   * @file contacts_person.h
   */
  
-- 
++
  /**
   * @ingroup CAPI_SOCIAL_CONTACTS_SVC_MODULE
   * @defgroup CAPI_SOCIAL_CONTACTS_SVC_PERSON_MODULE Person
@@@ -43,7 -43,7 +43,7 @@@
   * @{
   */
  
-- 
++
  /**
   * @brief Links a person to another person.
   * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 3.0 @endif
@@@ -197,7 -197,7 +197,7 @@@ int contacts_person_set_default_propert
  int contacts_person_get_default_property(contacts_person_property_e property,
                int person_id, int *id);
  
--              
++
  /**
   * @brief Gets aggregation suggestions.
   * @since_tizen 3.0
@@@ -227,7 -228,7 +228,7 @@@ int contacts_person_get_aggregation_sug
   * @}
   */
  
-- 
++
  #ifdef __cplusplus
  }
  #endif

diff --cc include/contacts_phone_log.h
index 125a7a0,609b02f..cf5539d
--- 1/include/contacts_phone_log.h
--- 2/include/contacts_phone_log.h
+++ b/include/contacts_phone_log.h
@@@ -16,8 -16,8 +16,8 @@@
   * limitations under the License.
   *
   */
-- 
-- 
++
++
  #ifndef __TIZEN_SOCIAL_CONTACTS_PHONELOG_H__
  #define __TIZEN_SOCIAL_CONTACTS_PHONELOG_H__
  
@@@ -32,7 -32,7 +32,7 @@@ extern "C
   * @file contacts_phone_log.h
   */
  
-- 
++
  /**
   * @ingroup CAPI_SOCIAL_CONTACTS_SVC_MODULE
   * @defgroup CAPI_SOCIAL_CONTACTS_SVC_PHONELOG_MODULE Phone log
@@@ -98,7 -97,7 +97,7 @@@ int contacts_phone_log_reset_statistics
   * @}
   */
  
-- 
++
  #ifdef __cplusplus
  }
  #endif

diff --cc include/contacts_record.h
index 9ba8571,f23891e..411e802
--- 1/include/contacts_record.h
--- 2/include/contacts_record.h
+++ b/include/contacts_record.h
@@@ -16,8 -16,8 +16,8 @@@
   * limitations under the License.
   *
   */
-- 
-- 
++
++
  #ifndef __TIZEN_SOCIAL_CONTACTS_RECORD_H__
  #define __TIZEN_SOCIAL_CONTACTS_RECORD_H__
  
@@@ -32,7 -32,7 +32,7 @@@ extern "C
   * @file contacts_record.h
   */
  
-- 
++
  /**
   * @ingroup CAPI_SOCIAL_CONTACTS_SVC_MODULE
   * @defgroup CAPI_SOCIAL_CONTACTS_SVC_RECORD_MODULE Record
@@@ -386,7 -380,7 +380,7 @@@ int contacts_record_get_uri_p(contacts_
   * @}
   */
  
-- 
++
  #ifdef __cplusplus
  }
  #endif

diff --cc include/contacts_setting.h
index 895cc4a,d894fa7..7c14c1d
--- 1/include/contacts_setting.h
--- 2/include/contacts_setting.h
+++ b/include/contacts_setting.h
@@@ -16,6 -16,8 +16,8 @@@
   * limitations under the License.
   *
   */
 - 
 - 
++
++
  #ifndef __TIZEN_SOCIAL_CONTACTS_SETTING_H__
  #define __TIZEN_SOCIAL_CONTACTS_SETTING_H__
  
@@@ -30,7 -32,7 +32,7 @@@ extern "C
   * @file contacts_setting.h
   */
  
-- 
++
  /**
   * @ingroup CAPI_SOCIAL_CONTACTS_SVC_MODULE
   * @defgroup CAPI_SOCIAL_CONTACTS_SVC_SETTING_MODULE Setting
@@@ -41,7 -43,7 +43,7 @@@
   * @{
   */
  
-- 
++
  /**
   * @brief Enumeration for name display order.
   * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 3.0 @endif
@@@ -248,8 -251,8 +251,8 @@@ int contacts_setting_remove_name_sortin
  /**
   * @}
   */
-  
-  
+ 
 - 
++
  #ifdef __cplusplus
  }
  #endif

diff --cc include/contacts_types.h
index e0556bc,831f484..d838d02
--- 1/include/contacts_types.h
--- 2/include/contacts_types.h
+++ b/include/contacts_types.h
@@@ -17,7 -17,7 +17,7 @@@
   *
   */
  
-- 
++
  #ifndef __TIZEN_SOCIAL_CONTACTS_TYPES_H__
  #define __TIZEN_SOCIAL_CONTACTS_TYPES_H__
  
@@@ -58,7 -58,7 +58,7 @@@ extern "C
  #define _CONTACTS_END_VIEW(name) } name##_property_ids; \
        extern __attribute__ ((visibility("default"))) const name##_property_ids name;
  
--      
++
  #define _CONTACTS_END_READ_ONLY_VIEW(name) _CONTACTS_END_VIEW(name)
  
  
@@@ -76,13 -76,13 +76,13 @@@ _CONTACTS_HANDLE(contacts_h
   * @file contacts_types.h
   */
  
-- 
++
  /**
   * @addtogroup CAPI_SOCIAL_CONTACTS_SVC_RECORD_MODULE
   * @{
   */
  
-- 
++
  /**
   * @brief Enumeration for contacts data type.
   * @since_tizen 3.0
@@@ -263,9 -261,8 +261,9 @@@ typedef enum 
        CONTACTS_EVENT_CALENDAR_TYPE_CHINESE /**< Chinese calenadr */
  } contacts_event_calendar_type_e;
  
 +
  /**
-  * @brief Enumeration for Contact image type
+  * @brief Enumeration for Contact image type.
   * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 3.0 @endif
   *
   */
@@@ -380,7 -377,7 +378,7 @@@ typedef enum 
   * @}
   */
  
-- 
++
  #ifdef __cplusplus
  }
  #endif

diff --cc include/contacts_views.h
Simple merge