[dali_1.3.23] Merge branch 'devel/master' 69/177969/1
authorAngelos Gkountis <a.gkountis@samsung.com>
Fri, 4 May 2018 15:29:26 +0000 (16:29 +0100)
committerAngelos Gkountis <a.gkountis@samsung.com>
Fri, 4 May 2018 15:29:26 +0000 (16:29 +0100)
Change-Id: I5a3d4b8e44434cc1c12f4f2ba6a2f5c7bf3d461c


Trivial merge