[dali_2.0.1] Merge branch 'devel/master' 12/247712/1
authorCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 13 Nov 2020 14:54:21 +0000 (14:54 +0000)
committerCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 13 Nov 2020 14:54:21 +0000 (14:54 +0000)
Change-Id: Ie63f92d9f407f46ca66006c6eb2c13d7d422bb16


Trivial merge