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


Trivial merge