Merge "Added Control::SetSubState handling" into devel/master

author Adeel Kazmi <adeel.kazmi@samsung.com>

Thu, 23 Feb 2017 19:15:10 +0000 (11:15 -0800)

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

Thu, 23 Feb 2017 19:15:11 +0000 (11:15 -0800)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Thu, 23 Feb 2017 19:15:10 +0000 (11:15 -0800)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 23 Feb 2017 19:15:11 +0000 (11:15 -0800)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Thu, 23 Feb 2017 19:15:10 +0000 (11:15 -0800)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 23 Feb 2017 19:15:11 +0000 (11:15 -0800)