Merge branch 'tizen_3.0' into tizen

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

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

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

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

diff --cc src/sdbd_plugin.h
index 0ffe5e5,e98ef69..e98ef69
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 8b7acd2,71d646d..71d646d
mode 100644,100644..100755
--- 1/src/sockets.c
--- 2/src/sockets.c
+++ b/src/sockets.c

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