[dali_1.2.29] Merge branch 'devel/master' 95/117295/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 3 Mar 2017 14:07:06 +0000 (14:07 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 3 Mar 2017 14:07:06 +0000 (14:07 +0000)
commita4dd5a82c1ff9a703ac8744d628def9ddefd9223
tree009133217febd2cf37d4eb5962f8f9e11986b546
parentd004f55428247931f310b8d229368e18536464cb
parentaa5ba6a135772876faa48fbb312b2392d8a7a452
[dali_1.2.29] Merge branch 'devel/master'

Change-Id: Idd04b72191ed1480b34b804544c04dbb196c4209