[dali_1.3.15] Merge branch 'devel/master' 84/172084/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 9 Mar 2018 14:12:28 +0000 (14:12 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 9 Mar 2018 14:12:28 +0000 (14:12 +0000)
commitcdc43ca498177aa260fec6edf2882e92e5fc79d8
treed7fd57049404df251cfc88343b98d66f10dffaef
parent95afeff364735d49c26422e2875dd638b082954a
parentb95c1812e610df12ff2d00d6fed96a5e090aca18
[dali_1.3.15] Merge branch 'devel/master'

Change-Id: Idab5860964b8848f1bf5330d7fffbbe2f60edad9