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


Trivial merge