Merge "[SM] Cancel button action fixed in timer popup" into tizen

author Kiseok Chang <kiso.chang@samsung.com>

Thu, 12 Oct 2017 05:39:16 +0000 (05:39 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Thu, 12 Oct 2017 05:39:16 +0000 (05:39 +0000)
author Kiseok Chang <kiso.chang@samsung.com>
Thu, 12 Oct 2017 05:39:16 +0000 (05:39 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 12 Oct 2017 05:39:16 +0000 (05:39 +0000)
diff --cc setting-smartmanager/smartmanager-data/src/smartmanager-data-usage-mobile-settings.c
Simple merge
author	Kiseok Chang <kiso.chang@samsung.com>
	Thu, 12 Oct 2017 05:39:16 +0000 (05:39 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Thu, 12 Oct 2017 05:39:16 +0000 (05:39 +0000)