[dali_1.2.18] Merge branch 'devel/master' 46/103846/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 9 Dec 2016 14:36:24 +0000 (14:36 +0000)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 9 Dec 2016 14:36:24 +0000 (14:36 +0000)
commit76de1e2c1d6963ef42a587a8e27756bfe7e0141c
tree71eebf2507d537604f78224321901aae2691e4fb
parenteb237d3531280007d6518e763dac1c3f34805741
parent23b59c2e558d0f11e5f4cb5229d095cfeae71c75
[dali_1.2.18] Merge branch 'devel/master'

Change-Id: I7ad996e0e42580b1851ba8967cdce724b46baeba