Merge "calculate kdbus timeout based on user timeout" into tizen accepted/tizen/common/20160905.171607 accepted/tizen/ivi/20160907.060148 accepted/tizen/mobile/20160907.060059 accepted/tizen/tv/20160907.060115 accepted/tizen/wearable/20160907.060135 submit/tizen/20160905.073119 submit/tizen/20160905.094007 submit/tizen/20160905.095924
authorHyotaek Shim <hyotaek.shim@samsung.com>
Thu, 1 Sep 2016 03:38:20 +0000 (20:38 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 1 Sep 2016 03:38:20 +0000 (20:38 -0700)
1  2 
dbus/dbus-transport-kdbus.c

Simple merge