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


Trivial merge