Merge branch 'tizen_3.0' into tizen

Change-Id: I700aec60ab37b0f533572483b0048d60fb1622bb
Signed-off-by: SangJin Kim <sangjin3.kim@samsung.com>

diff --cc CMakeLists.txt
index 43b43b821ed66e4b5a6194c5f12e635d208d6570,e16df2d239df7111d8a45ff52e3b2ba7aab7565c..e16df2d239df7111d8a45ff52e3b2ba7aab7565c
mode 100644,100644..100755
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt

diff --cc src/sdb.c
index 1bd095eb2727264f815bba7d10dd2bf705c5084e,a07a88129a19b749f056f6a7e9dc8d302253e0f4..a07a88129a19b749f056f6a7e9dc8d302253e0f4
mode 100644,100644..100755
--- 1/src/sdb.c
--- 2/src/sdb.c
+++ b/src/sdb.c

diff --cc src/sdb.h
index f3d8d98c56128bf70de50ba7d5abc696e25e36da,226da6430f9cbb5df8890763b0b01061a58245df..226da6430f9cbb5df8890763b0b01061a58245df
mode 100644,100644..100755
--- 1/src/sdb.h
--- 2/src/sdb.h
+++ b/src/sdb.h

diff --cc src/sdbd_plugin.h
index 0ffe5e5ba36ef83671b2ee86eac154dbb1685476,e98ef69e49f01663b7471ce717accf8a612ca8c5..e98ef69e49f01663b7471ce717accf8a612ca8c5
mode 100644,100644..100755
--- 1/src/sdbd_plugin.h
--- 2/src/sdbd_plugin.h
+++ b/src/sdbd_plugin.h

diff --cc src/sockets.c
index 8b7acd246207aca5650ed769e3c3d8e7eae7482b,71d646d262e6c4aa20503a1c207ce9d78b24721a..71d646d262e6c4aa20503a1c207ce9d78b24721a
mode 100644,100644..100755
--- 1/src/sockets.c
--- 2/src/sockets.c
+++ b/src/sockets.c

diff --cc src/transport.c
index fdc8d0c03e4a248cc4332d089d74feef54886bcc,7811628ed61f8e6e90da538e47a3cf526dfde71e..7811628ed61f8e6e90da538e47a3cf526dfde71e
mode 100644,100644..100755
--- 1/src/transport.c
--- 2/src/transport.c
+++ b/src/transport.c