[Tizen] Fix TC code conflict
authorJoogab Yun <joogab.yun@samsung.com>
Tue, 10 Sep 2019 09:00:11 +0000 (18:00 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Tue, 10 Sep 2019 09:00:14 +0000 (18:00 +0900)
commit4440dd2f922b7572d51bf6ae870836b267c26993
treee216bb8f14095a577d8e9000e0ccf10b7948884e
parent9195353f93b25c5ef04c35dad3405a2afff80a7a
[Tizen] Fix TC code conflict

This reverts commit 3b50e9c0e5e48ef30d52b7949966e2c145f73e4c.

Change-Id: I763a696bf24b0ff98cccb06cce927ed1f53a250d
automated-tests/src/dali/utc-Dali-Scene.cpp