[Tizen] Fix merge conflict on previous commit 35/192435/1 submit/tizen/20181105.120114
-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