Merge branch 'master' into tizen

diff --cc adaptors/tizen/internal/common/events/event-handler.cpp
Simple merge

diff --cc adaptors/tizen/internal/common/indicator-impl.cpp
Simple merge

diff --cc adaptors/tizen/internal/common/indicator-impl.h
Simple merge

diff --cc adaptors/tizen/internal/common/object-profiler.cpp
Simple merge

diff --cc adaptors/tizen/internal/common/object-profiler.h
Simple merge

diff --cc adaptors/tizen/internal/common/window-impl.cpp
Simple merge

diff --cc adaptors/tizen/internal/common/window-impl.h
Simple merge

diff --cc adaptors/tizen/public-api/adaptor-framework/common/window.cpp
Simple merge

diff --cc capi/dali/public-api/adaptor-framework/common/window.h
Simple merge

diff --cc packaging/dali-adaptor.spec
index 59fc60e8424f7004083c636a2da81352283cb8fe,e7e387fb2dd1f78a71339e1d4d7e38fbe9069438..03339366c2581c699c5bbd2bdb6d60de11244f24
--- 1/packaging/dali-adaptor.spec
--- 2/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@@ -1,9 -1,9 +1,9 @@@
  Name:       dali-adaptor
  Summary:    The DALi Tizen Adaptor
- Version:    0.9.15
+ Version:    0.9.18
  Release:    1
  Group:      System/Libraries
 -License:    Flora
 +License:    Apache 2.0
  URL:        https://review.tizen.org/git/?p=platform/core/uifw/dali-adaptor.git;a=summary
  Source0:    %{name}-%{version}.tar.gz