[dali_1.9.21] Merge branch 'devel/master' 21/238821/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Jul 2020 12:13:12 +0000 (13:13 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 17 Jul 2020 12:13:12 +0000 (13:13 +0100)
commit038041163bece4fd871992188cdd8eb5e41f45ce
tree73e49b56cb239d8b04146b3380717c10d62fd26b
parent66c398b89c91bd7d16856cbac44e2f17e18d8d5d
parentdb6e6be98c2b2cfcbb34a87ac0de142640e39de5
[dali_1.9.21] Merge branch 'devel/master'

Change-Id: Ic7fce82806e550973d53fc7c01df957e7b6487a8