[dali_1.0.47] Merge branch 'devel/master' 94/42694/1
authorFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:18:59 +0000 (14:18 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:18:59 +0000 (14:18 +0100)
commitadc926dbb6442d4d24ac8182a63269dfa9525b5a
tree15e3ebd044729d57b332e1f67ee7232d7d252882
parent9ff918e3bbc5b9d668dd428a43ce223a65360b92
parentdc34fb8d6b11bf062de76a18b7cc4d63e588bc1d
[dali_1.0.47] Merge branch 'devel/master'

Change-Id: I95ba94a2065d39d1eb479e19f463b303ac6d605b