[dali_1.2.29] Merge branch 'devel/master' 97/117297/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 3 Mar 2017 14:07:40 +0000 (14:07 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 3 Mar 2017 14:07:40 +0000 (14:07 +0000)
Change-Id: I1409c2df0c9f782dfda16343b181a3088cb795c0


Trivial merge