[dali_1.9.16] Merge branch 'devel/master' 61/236061/1
authorCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 12 Jun 2020 09:07:49 +0000 (10:07 +0100)
committerCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 12 Jun 2020 09:07:49 +0000 (10:07 +0100)
Change-Id: I3019b185575123c2e980c2bf88662ea2432c8008


Trivial merge