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

Conflicts:
	automated-tests/src/dali-internal/CMakeLists.txt
	automated-tests/src/dali/CMakeLists.txt

Change-Id: Icbd7f85f995462af30937b35579564640a027afd

diff --cc automated-tests/src/dali-internal/CMakeLists.txt
index e97ef71,f67751a..a52b0a1
--- 1/automated-tests/src/dali-internal/CMakeLists.txt
--- 2/automated-tests/src/dali-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-internal/CMakeLists.txt
@@@ -9,9 -9,12 +9,8 @@@ SET(TC_SOURCE
          utc-Dali-Internal-Handles.cpp
          utc-Dali-Internal-ImageFactory.cpp
          utc-Dali-Internal-Mesh.cpp
 -        utc-Dali-Internal-Text.cpp
          utc-Dali-Internal-ResourceClient.cpp
          utc-Dali-Internal-Image-Culling.cpp
-         utc-Dali-Internal-Constraint.cpp
 -        utc-Dali-Internal-Text-Culling.cpp
          utc-Dali-Internal-FixedSizeMemoryPool.cpp
          utc-Dali-Internal-MemoryPoolObjectAllocator.cpp
          utc-Dali-Internal-RelayoutController.cpp

diff --cc automated-tests/src/dali/CMakeLists.txt
index 0064fab,7d53326..39bde11
--- 1/automated-tests/src/dali/CMakeLists.txt
--- 2/automated-tests/src/dali/CMakeLists.txt
+++ b/automated-tests/src/dali/CMakeLists.txt
@@@ -17,7 -16,7 +16,6 @@@ SET(TC_SOURCE
          utc-Dali-BaseHandle.cpp
          utc-Dali-BufferImage.cpp
          utc-Dali-CameraActor.cpp
-         utc-Dali-Constraint.cpp
 -        utc-Dali-Character.cpp
          utc-Dali-Context.cpp
          utc-Dali-CustomActor.cpp
          utc-Dali-Degree.cpp

diff --cc automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h
Simple merge

diff --cc automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
Simple merge

diff --cc dali/integration-api/profiling.cpp
Simple merge

diff --cc dali/internal/file.list
Simple merge

diff --cc dali/internal/update/manager/update-algorithms.cpp
Simple merge

diff --cc dali/public-api/dali-core.h
index f78220b,2bb3151..42ce2f2
--- 1/dali/public-api/dali-core.h
--- 2/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@@ -29,13 -29,11 +29,10 @@@
  #include <dali/public-api/actors/layer.h>
  #include <dali/public-api/actors/mesh-actor.h>
  #include <dali/public-api/actors/renderable-actor.h>
 -#include <dali/public-api/actors/text-actor.h>
  #include <dali/public-api/actors/sampling.h>
  
- #include <dali/public-api/animation/active-constraint-declarations.h>
- #include <dali/public-api/animation/active-constraint.h>
  #include <dali/public-api/animation/alpha-functions.h>
  #include <dali/public-api/animation/animation.h>
- #include <dali/public-api/animation/constraint-functions.h>
  #include <dali/public-api/animation/constraint-source.h>
  #include <dali/public-api/animation/constraint.h>
  #include <dali/public-api/animation/constraints.h>

diff --cc dali/public-api/file.list
index 65f3740,2009651..e933dd1
--- 1/dali/public-api/file.list
--- 2/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@@ -9,8 -9,8 +9,7 @@@ public_api_src_files = 
    $(public_api_src_dir)/actors/image-actor.cpp \
    $(public_api_src_dir)/actors/layer.cpp \
    $(public_api_src_dir)/actors/mesh-actor.cpp \
 -  $(public_api_src_dir)/actors/text-actor.cpp \
    $(public_api_src_dir)/actors/renderable-actor.cpp \
-   $(public_api_src_dir)/animation/active-constraint.cpp \
    $(public_api_src_dir)/animation/animation.cpp \
    $(public_api_src_dir)/animation/alpha-functions.cpp \
    $(public_api_src_dir)/animation/constraint.cpp \

diff --cc dali/public-api/shader-effects/shader-effect.h
Simple merge