[dali_1.4.0] Merge branch 'devel/master' 95/196095/1
authorGyörgy Straub <g.straub@partner.samsung.com>
Fri, 21 Dec 2018 10:22:47 +0000 (10:22 +0000)
committerGyörgy Straub <g.straub@partner.samsung.com>
Fri, 21 Dec 2018 10:22:47 +0000 (10:22 +0000)
commit5b142197440856dc8f3a98133d52a9ae20a9883b
treeec2279e85283cb61e692706e6950e8827faa47d2
parent1ee183322cec3dbfbb7eafe7309ec30eb760b09a
parent9dd163a0f41423be80c45e4350a4db2ca2aee59b
[dali_1.4.0] Merge branch 'devel/master'

Change-Id: Iae421e27c096c883fe2c566fa5f616f92e84a9fb