[dali_1.2.41] Merge branch 'devel/master' 50/131350/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 26 May 2017 12:31:40 +0000 (13:31 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 26 May 2017 12:31:40 +0000 (13:31 +0100)
commit96d995c2f22cb20080496e7442c4683eccc62a99
treef23449fc873d65064352b6fb4a2d9a2f834816fd
parentc2c6ef4249c29f78bf92762137ec7b4eb7087ca6
parent0956b458d0eb2745771cbd7678c354d61621241d
[dali_1.2.41] Merge branch 'devel/master'

Change-Id: Ia8f3460be6c1849464993b88402916d5707557c3