[dali_1.4.33] Merge branch 'devel/master' 82/212182/1
authorCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 16 Aug 2019 09:41:59 +0000 (10:41 +0100)
committerCheng-Shiun Tsai <cheng.tsai@samsung.com>
Fri, 16 Aug 2019 09:41:59 +0000 (10:41 +0100)
Change-Id: I41b3fa0da45b8a773fc65f1c85072ed53831c8ea


Trivial merge