[Tizen] Fix TC code conflict 92/213092/1
authorWonsik Jung <sidein@samsung.com>
Fri, 30 Aug 2019 07:34:29 +0000 (16:34 +0900)
committerWonsik Jung <sidein@samsung.com>
Fri, 30 Aug 2019 07:37:27 +0000 (16:37 +0900)
commit687297e3c642c9056587a57a5fa853085ed12623
tree05b71b3aeada0dda58b114a079b8a097de7f9da0
parent8b333e361f0795f5d1e5b11349b1177876d69094
[Tizen] Fix TC code conflict

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