[dali_1.3.19] Merge branch 'devel/master' 76/175076/1
authorRichard Huang <r.huang@samsung.com>
Fri, 6 Apr 2018 13:55:53 +0000 (14:55 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 6 Apr 2018 13:55:53 +0000 (14:55 +0100)
Change-Id: Ic70cc947f7de653047eea2ebcf4e7bb569dd4f79


Trivial merge