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


Trivial merge