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


Trivial merge