[dali_1.2.40] Merge branch 'devel/master' 29/130229/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:43:54 +0000 (13:43 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 19 May 2017 12:43:54 +0000 (13:43 +0100)
commit091424324901c46a18959bfc0dd52f7ce8a0a811
tree7f7fc9dcfb7b9b2b79d7043f6911035d7b581b40
parentcf70a56a2d77c517c30f66bd9eb5a6144b774227
parentea4e2434bd59a74b06e81e1c6d08de628160e14d
[dali_1.2.40] Merge branch 'devel/master'

Change-Id: I8d45353a19b8f0ae86be178a2325a04e0b8beab1