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


Trivial merge