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


Trivial merge