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


Trivial merge