From: Yunmi Ha <yunmi.ha@samsung.com>
Date: Tue, 5 Jul 2016 23:30:35 +0000 (-0700)
Subject: Merge "Fix bug - add daemon timeout" into tizen
X-Git-Tag: accepted/tizen/common/20160706.142835^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e40ba3926099d26dcceb36c6246b729fcfe839a;p=platform%2Fupstream%2Fgumd.git

Merge "Fix bug - add daemon timeout" into tizen
---

8e40ba3926099d26dcceb36c6246b729fcfe839a
diff --cc src/daemon/dbus/gumd-dbus-group-service-adapter.c
index cc4a9c8,319ae4a..319ae4a
mode 100755,100644..100755
--- a/src/daemon/dbus/gumd-dbus-group-service-adapter.c
+++ b/src/daemon/dbus/gumd-dbus-group-service-adapter.c
diff --cc src/daemon/dbus/gumd-dbus-user-service-adapter.c
index 9c15f89,eb77333..eb77333
mode 100755,100644..100755
--- a/src/daemon/dbus/gumd-dbus-user-service-adapter.c
+++ b/src/daemon/dbus/gumd-dbus-user-service-adapter.c