Merge "Add push-button sample for dashboard" into devel/master

author Minho Sun <minho.sun@samsung.com>

Mon, 26 Dec 2016 05:28:13 +0000 (21:28 -0800)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Mon, 26 Dec 2016 05:28:13 +0000 (21:28 -0800)
author Minho Sun <minho.sun@samsung.com>
Mon, 26 Dec 2016 05:28:13 +0000 (21:28 -0800)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 26 Dec 2016 05:28:13 +0000 (21:28 -0800)
diff --cc plugins/dali-swig/examples/control-dashboard.cs
Simple merge
author	Minho Sun <minho.sun@samsung.com>
	Mon, 26 Dec 2016 05:28:13 +0000 (21:28 -0800)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Mon, 26 Dec 2016 05:28:13 +0000 (21:28 -0800)