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


Trivial merge