[dali_1.2.20] Merge branch 'devel/master'
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Dec 2016 10:46:43 +0000 (10:46 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Dec 2016 10:46:43 +0000 (10:46 +0000)
commita12337bbdda3171c8f8500bf20fd298accf2b0a7
tree7c9f6ca9ad5dc87374899e9fb50e6a27f1f4b346
parentfee9b7f1720a901d55cc317742230ee2bd170121
parent436b7cc4d359d29e721fc0bc9f6ee40fab831843
[dali_1.2.20] Merge branch 'devel/master'

Change-Id: Ib13b9cd336cd80eac82878063dcb8ed3cee848ec