[dali_1.3.10] Merge branch 'devel/master' 22/169122/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 2 Feb 2018 10:29:00 +0000 (10:29 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 2 Feb 2018 10:29:00 +0000 (10:29 +0000)
commit11e160726b35fb762e7dd80b679a60cfb8b4e1e6
treea969bb2fe1dd3920bbb44b0fc1c1eab0e9f429e1
parent6b42485bf383a83c4a1841080bec303ad15eaaec
parenta413143a455101bb12880733a7c44d29e64edb15
[dali_1.3.10] Merge branch 'devel/master'

Change-Id: Iba8d5aab5033ff712e0a175caf4157c7678a55a1