[dali_1.3.20] Merge branch 'devel/master' 32/175932/1
authoradam.b <adam.b@samsung.com>
Fri, 13 Apr 2018 10:50:00 +0000 (11:50 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 13 Apr 2018 10:50:00 +0000 (11:50 +0100)
commitfe36fd17d36a926dd615a46b1675ee1f900aa3f6
tree86930fc3290061fe80415c2fc4333b3c8e6df4ed
parent1fe818eac004a275a4d95474ef1d20e2e5f89256
parentfc4028c2945991610c96fdb354178ce5089bb2b9
[dali_1.3.20] Merge branch 'devel/master'

Change-Id: I254c7b4507228ca086e4e4a528e34e4741378dab