[dali_1.3.33] Merge branch 'devel/master' 29/184729/1
authorAngelos Gkountis <a.gkountis@samsung.com>
Fri, 20 Jul 2018 12:31:10 +0000 (13:31 +0100)
committerAngelos Gkountis <a.gkountis@samsung.com>
Fri, 20 Jul 2018 12:31:10 +0000 (13:31 +0100)
commit2e6291913aa11e50101a3a572a79a294e692120f
treedc5d53f756de4736bd855e41b0f6964caf08eb73
parent26d27bbda564df706c5f82b6ec0d6f3ea76ee0b2
parent7d23b23e2c92ddb2a3826be7853d732f72ba865a
[dali_1.3.33] Merge branch 'devel/master'

Change-Id: Id4b670e442cdf3bdd5dda74217cd098a3e0ae61c