[dali_1.0.47] Merge branch 'devel/master' 96/42696/1
authorFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:19:04 +0000 (14:19 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:19:04 +0000 (14:19 +0100)
commite1928a41bae3bf2f6cc70172d3f539f91edb3b89
treed5f8b74d2bd02c601cad78ac33eb633c5074fd9f
parent45a1914d7dea8f01033024dcf56513967a1bd0ff
parenta01e79ebf2ae6fbfd58d9495796cf371ad25c73a
[dali_1.0.47] Merge branch 'devel/master'

Change-Id: Ia4e16d5765c0e822b3291feafcc0022dff400d0d