[dali_1.3.39] Merge branch 'devel/master' 14/188114/1
authorRichard Huang <r.huang@samsung.com>
Fri, 31 Aug 2018 09:41:12 +0000 (10:41 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 31 Aug 2018 09:41:12 +0000 (10:41 +0100)
Change-Id: I6ca785b321c650360abb34276c8be506a8598e73


Trivial merge