[dali_1.3.22] Merge branch 'devel/master' 75/177375/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 27 Apr 2018 11:06:16 +0000 (12:06 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 27 Apr 2018 11:06:16 +0000 (12:06 +0100)
Change-Id: Ie1b53040ef090b9f4affc165b84946702e8d9d83


Trivial merge