[dali_1.3.21] Merge branch 'devel/master' 58/176658/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 20 Apr 2018 10:58:38 +0000 (11:58 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 20 Apr 2018 10:58:38 +0000 (11:58 +0100)
commitccbdfe195ca62244291ee2c21a68c004df981a4b
tree97e183d4c4eda44d1d767567adff2181ccccf6d5
parent9d0ced243021aee7b9fbc9499d60cfc124b6b762
parentde325391de0fb22e8d8570272ff21c376bdb610f
[dali_1.3.21] Merge branch 'devel/master'

Change-Id: I9291712a30ab1f19b7c0324bbe2160bba405a83d