Merge "Check for NULL return value in button-impl.cpp" into devel/master

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

Fri, 12 May 2017 18:22:28 +0000 (18:22 +0000)

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

Fri, 12 May 2017 18:22:28 +0000 (18:22 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 May 2017 18:22:28 +0000 (18:22 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 12 May 2017 18:22:28 +0000 (18:22 +0000)
diff --cc dali-toolkit/internal/controls/buttons/button-impl.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Fri, 12 May 2017 18:22:28 +0000 (18:22 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Fri, 12 May 2017 18:22:28 +0000 (18:22 +0000)