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


Trivial merge