[dali_1.2.41] Merge branch 'devel/master' 51/131351/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 May 2017 12:31:56 +0000 (13:31 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 May 2017 12:31:56 +0000 (13:31 +0100)
commitc5532e5780e20d0631ab90e5bc592a158ffc3d74
treeac857081e60567026b7ec48b286420fbd819f96a
parent0ee36c9ea82c061d8306bdd2c5bf99b9089bd631
parentc78f23720a443c966e0de173fe532c1c0f094545
[dali_1.2.41] Merge branch 'devel/master'

Change-Id: I48c6cf9d568d1836463ee5751d083f81e6f50282