[dali_1.4.21] Merge branch 'devel/master' 40/206740/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 May 2019 06:07:13 +0000 (07:07 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 May 2019 06:07:13 +0000 (07:07 +0100)
commit533424c32862b9764cc0592a4c174589a0914c98
tree961d7822ea94f301b577722de4e0b3d318033005
parentbc9255ec35bec7223cd6a18fb2b3a6fcc273936b
parent912def9c1faed69ac686389bc8e070046beb4a65
[dali_1.4.21] Merge branch 'devel/master'

Change-Id: Ifd23b9f26aca6bd56aa53b4dc38c1519a622ba3c