[dali_1.9.8] Merge branch 'devel/master' 21/231121/1
authorCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 17 Apr 2020 09:08:02 +0000 (10:08 +0100)
committerCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 17 Apr 2020 09:08:02 +0000 (10:08 +0100)
Change-Id: Ie0e2dc42c74b026f5d2edfbff82452a8544bfd51


Trivial merge