Merge "Legacy Size negotiation mapper" into devel/master

diff --cc automated-tests/src/dali-toolkit/CMakeLists.txt
index f193458,33adccc..ac4c3d5
--- 1/automated-tests/src/dali-toolkit/CMakeLists.txt
--- 2/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@@ -26,8 -26,8 +26,9 @@@ SET(TC_SOURCE
    utc-Dali-JsonParser.cpp
    utc-Dali-KeyInputFocusManager.cpp
    utc-Dali-Layouting.cpp
+   utc-Dali-LayoutingResizePolicy.cpp
    utc-Dali-PageTurnView.cpp
 +  utc-Dali-Scene3dView.cpp
    utc-Dali-Script.cpp
    utc-Dali-ScrollBar.cpp
    utc-Dali-ScrollView.cpp

diff --cc dali-toolkit/devel-api/layouting/layout-group-impl.cpp
Simple merge

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