[dali_1.3.21] Merge branch 'devel/master' 61/176661/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 20 Apr 2018 10:59:17 +0000 (11:59 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 20 Apr 2018 10:59:17 +0000 (11:59 +0100)
commit0ca02ae8f3c7999bac0c1f8d58cf18dc70ce494e
treea7d7a1e3577115a810b7dae47e5849f3257dd8cf
parentfe36fd17d36a926dd615a46b1675ee1f900aa3f6
parentc051386e81039520cdbf1424f22d76eb4ecea8e8
[dali_1.3.21] Merge branch 'devel/master'

Change-Id: I285810a4ad5caaa609779af4bace4c30b8b46151