[dali_1.3.13] Merge branch 'devel/master' 69/170969/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 23 Feb 2018 13:29:59 +0000 (13:29 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 23 Feb 2018 13:29:59 +0000 (13:29 +0000)
Change-Id: I84a7b16575f925e6441620b70cc9daff40a9e2d5


Trivial merge