Merge "Fix nested layout issue" into devel/master

author David Steele <david.steele@samsung.com>

Wed, 20 Jun 2018 11:09:47 +0000 (11:09 +0000)

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

Wed, 20 Jun 2018 11:09:47 +0000 (11:09 +0000)
author David Steele <david.steele@samsung.com>
Wed, 20 Jun 2018 11:09:47 +0000 (11:09 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 20 Jun 2018 11:09:47 +0000 (11:09 +0000)
diff --cc dali-toolkit/devel-api/layouting/layout-item-impl.h
Simple merge
diff --cc dali-toolkit/devel-api/layouting/layout-parent-impl.h
Simple merge
author	David Steele <david.steele@samsung.com>
	Wed, 20 Jun 2018 11:09:47 +0000 (11:09 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Wed, 20 Jun 2018 11:09:47 +0000 (11:09 +0000)
		1	2
dali-toolkit/devel-api/layouting/layout-item-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history
dali-toolkit/devel-api/layouting/layout-parent-impl.h	patch \|	diff1 \|	diff2 \|	blob \| history