[dali_1.0.47] Merge branch 'devel/master' 97/42697/1
authorFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:19:23 +0000 (14:19 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Wed, 1 Jul 2015 13:19:23 +0000 (14:19 +0100)
commit09e0f6477db3adfa854d2ac4c376c4076bda9796
tree2af332da2148c06ca46537d9542b71298c80c085
parent14179d13fb9fa5e3d91eafcc6227228f12078dfc
parent2779ffb28a7b8bb89ed4eb8222020bc07eb05d50
[dali_1.0.47] Merge branch 'devel/master'

Change-Id: I5f90be6c874f1abd592bea10456473c00397b9dd