Merge "Button needs a simple mechanism to set text label" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 12 Jan 2017 18:58:03 +0000 (10:58 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 12 Jan 2017 18:58:03 +0000 (10:58 -0800)

Trivial merge