Merge "Size negotiation patch 1: Remove actor SetPreferredSize" into tizen

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

Thu, 2 Apr 2015 17:57:42 +0000 (10:57 -0700)

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

Thu, 2 Apr 2015 17:57:42 +0000 (10:57 -0700)
author Adeel Kazmi <adeel.kazmi@samsung.com>
Thu, 2 Apr 2015 17:57:42 +0000 (10:57 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 2 Apr 2015 17:57:42 +0000 (10:57 -0700)
diff --cc dali/internal/event/actors/actor-impl.cpp
Simple merge
author	Adeel Kazmi <adeel.kazmi@samsung.com>
	Thu, 2 Apr 2015 17:57:42 +0000 (10:57 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 2 Apr 2015 17:57:42 +0000 (10:57 -0700)