[Tizen] Fix TC code conflict
authorJoogab Yun <joogab.yun@samsung.com>
Mon, 16 Sep 2019 06:26:37 +0000 (15:26 +0900)
committerJoogab Yun <joogab.yun@samsung.com>
Mon, 16 Sep 2019 06:26:43 +0000 (15:26 +0900)
commit75552e8d3b4e8db822723d0c177afe1becc4b4cc
treedc9d12a55543f32d08bb81652afe66e607f4cada
parent066e741676a549a62adf20bec381e985c1ff5d6f
[Tizen] Fix TC code conflict

This reverts commit d4dffcf5267f3fc36c284f70347c4161a94c1ec9.

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