[dali_1.2.38] Merge branch 'devel/master' 94/128094/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:52:53 +0000 (10:52 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:52:53 +0000 (10:52 +0100)
commit84d264499ca69e9bf9187afcbadbe3dc43c7b087
tree7c953a1ea437a8f0f9e762a9b5719d4ef56e9443
parentd7656ad3955f3b9c864326ab0cb0805865cdc606
parente3a1b3129c69c1fe970f179908fa458444103d7d
[dali_1.2.38] Merge branch 'devel/master'

Change-Id: I4607f4d44db2f987b005cc0288cc090c18113a39