Merge "Add new layouting support for TextLabel and ImageView." into devel/master

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

Thu, 5 Jul 2018 15:24:55 +0000 (15:24 +0000)

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

Thu, 5 Jul 2018 15:24:55 +0000 (15:24 +0000)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Thu, 5 Jul 2018 15:24:55 +0000 (15:24 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 5 Jul 2018 15:24:55 +0000 (15:24 +0000)
diff --cc automated-tests/src/dali-toolkit/utc-Dali-Layouting.cpp
Simple merge
diff --cc dali-toolkit/internal/controls/image-view/image-view-impl.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Thu, 5 Jul 2018 15:24:55 +0000 (15:24 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Thu, 5 Jul 2018 15:24:55 +0000 (15:24 +0000)
		1	2
automated-tests/src/dali-toolkit/utc-Dali-Layouting.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/internal/controls/image-view/image-view-impl.cpp	patch \|	diff1 \|	diff2 \|	blob \| history