[dali_1.3.23] Merge branch 'devel/master' 66/177966/1
authorAngelos Gkountis <a.gkountis@samsung.com>
Fri, 4 May 2018 15:28:49 +0000 (16:28 +0100)
committerAngelos Gkountis <a.gkountis@samsung.com>
Fri, 4 May 2018 15:28:49 +0000 (16:28 +0100)
Change-Id: I308bd36260a02f5413ea0610801615a4c8846f39


Trivial merge