[dali_1.3.48] Merge branch 'devel/master' 60/192360/1
authorRichard Huang <r.huang@samsung.com>
Fri, 2 Nov 2018 11:43:06 +0000 (11:43 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 2 Nov 2018 11:43:06 +0000 (11:43 +0000)
Change-Id: Ie1cfe6f15f2e4bcd73df40cd940924a096deecb9


Trivial merge