[dali_1.1.20] Merge branch 'devel/master' 51/58951/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 5 Feb 2016 08:53:44 +0000 (08:53 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 5 Feb 2016 08:53:44 +0000 (08:53 +0000)
commitc284103e2575f3276ef70eee3953bea531484e29
tree351f960b50f0666b32263da4903dbc21ecc96bbc
parent912e891b33f2b3b10392094c57b17eefa560b1fa
parente7e3f154a32d54a92b5b30488a47afccdf89630d
[dali_1.1.20] Merge branch 'devel/master'

Change-Id: I09009ccbf42e5a4dd33277eb6bd5b732b9fbbae9