Merge branch 'tizen_3.0' into tizen

Change-ID: I364987d6b02d4538753a9b924fbd6769878510b3
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

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

diff --cc packaging/sdbd.spec
Simple merge

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

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

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

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