[dali_1.2.9] Merge branch 'devel/master' 59/91459/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:33:42 +0000 (16:33 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:33:42 +0000 (16:33 +0100)
commit2769117547e8dc557ee44189f40b7bd3f889f0a2
tree1719ef4f4a106390afbb55a0409f99439caeb231
parent5daebd886b9d88fbbbc6a6f328c04a6b1e7b09a6
parentc49fb108e609c02b80ccac40ab2208c04f6894fc
[dali_1.2.9] Merge branch 'devel/master'

Change-Id: Ic8669fdebe28c91e0cb70a86d471b02dee5a658f