[dali_1.3.4] Merge branch 'devel/master' 37/164137/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:24 +0000 (11:19 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:24 +0000 (11:19 +0000)
commit2307b91e8d379ce4444b4b48f9dbc576181a8cc0
tree9658ca9ea3f2e3ea482ebe8fc3c42928ee5476f7
parent9e5bcf677794ed4c12fbc32e3a8900f0ad561120
parent3ccd8135e6028a38d2e0faf72b947c4137456241
[dali_1.3.4] Merge branch 'devel/master'

Change-Id: I109efd16241c715de9bdb0846ee40427b0a5154a