[dali_1.9.16] Merge branch 'devel/master' 66/236066/1
authorCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 12 Jun 2020 09:08:20 +0000 (10:08 +0100)
committerCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 12 Jun 2020 09:08:20 +0000 (10:08 +0100)
Change-Id: Ie2b2e22aa8983f606dedaef5d77e99568e47b37b


Trivial merge