[dali_1.2.9] Merge branch 'devel/master' 60/91460/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:33:49 +0000 (16:33 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:33:49 +0000 (16:33 +0100)
commit91da545e388d51fe5a632be1af101f74651e397b
tree974e37fed8dda05929e29984075a53d6c212bfb2
parentc6de557aa842b74aa54e2339e5b207a92a773919
parent1048a515c4c1bd996fd3c7fc739ea8b0b9affd4b
[dali_1.2.9] Merge branch 'devel/master'

Change-Id: I74ac536c9474cdb77e293b365718508211fd67e2