[dali_1.9.8] Merge branch 'devel/master' 20/231120/1
authorCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 17 Apr 2020 09:07:51 +0000 (10:07 +0100)
committerCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 17 Apr 2020 09:07:51 +0000 (10:07 +0100)
Change-Id: I08897468bc1bd0c64a8fe194b8fb35c8c64d79fd


Trivial merge