Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	adaptors/common/adaptor-impl.cpp
	adaptors/common/application-impl.cpp

Change-Id: Ic74c259b7a0dfc5f103c7afd93a8e567aee77be2

diff --cc adaptors/common/application-impl.cpp
Simple merge

diff --cc adaptors/common/gl/egl-image-extensions.cpp
index 3533d7d,3533d7d..5c47fe0
--- 1/adaptors/common/gl/egl-image-extensions.cpp
--- 2/adaptors/common/gl/egl-image-extensions.cpp
+++ b/adaptors/common/gl/egl-image-extensions.cpp
@@@ -94,7 -94,7 +94,7 @@@ void* EglImageExtensions::CreateImageKH
                                               attribs );
  
    DALI_ASSERT_DEBUG( EGL_NO_IMAGE_KHR != eglImage && "X11Image::GlExtensionCreate eglCreateImageKHR failed!\n");
--  if( EGL_NO_IMAGE_KHR != eglImage )
++  if( EGL_NO_IMAGE_KHR == eglImage )
    {
      switch( eglGetError() )
      {

diff --cc adaptors/common/window-impl.h
index 757e33b,757e33b..3a56b27
--- 1/adaptors/common/window-impl.h
--- 2/adaptors/common/window-impl.h
+++ b/adaptors/common/window-impl.h
@@@ -171,7 -171,7 +171,6 @@@ public
     */
    void RotationDone( int orientation, int width, int height );
  
--
  private:
    /**
     * Private constructor.

diff --cc adaptors/public-api/adaptor-framework/window.h
index c7f2511,c7f2511..aecf25c
--- 1/adaptors/public-api/adaptor-framework/window.h
--- 2/adaptors/public-api/adaptor-framework/window.h
+++ b/adaptors/public-api/adaptor-framework/window.h
@@@ -241,7 -241,7 +241,6 @@@ public
     * @brief Get the native handle of the window.
     * @return The native handle of the window or an empty handle.
     */
--
    Any GetNativeHandle() const;
  
  public: // Signals

diff --cc build/tizen/adaptor/Makefile.am
Simple merge

diff --cc packaging/dali-adaptor-mobile.spec
Simple merge

diff --cc packaging/dali-adaptor-tv.spec
Simple merge

diff --cc packaging/dali-adaptor-wearable.spec
Simple merge

diff --cc packaging/dali-adaptor.spec
Simple merge