[Tizen] Fix merge conflict on previous commit 36/192436/1 accepted/tizen/5.0/unified/20181106.070424 submit/tizen_5.0/20181105.121940
-rw-r--r-- 10237 LICENSE
drwxr-xr-x - build
-rw-r--r-- 67 dali-extension.manifest
drwxr-xr-x - dali-extension
drwxr-xr-x - packaging