[dali_1.3.48] Merge branch 'devel/master' 59/192359/1
authorRichard Huang <r.huang@samsung.com>
Fri, 2 Nov 2018 11:42:58 +0000 (11:42 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 2 Nov 2018 11:42:58 +0000 (11:42 +0000)
Change-Id: I40bd049b9feae615c9641abddf23addc90eda52a


Trivial merge