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


Trivial merge