[dali_1.3.14] Merge branch 'devel/master' 12/171412/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 2 Mar 2018 11:52:02 +0000 (11:52 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 2 Mar 2018 11:52:02 +0000 (11:52 +0000)
commit568a53fc798b90ce8af9950d73050418cff21bc4
treed41ae9318ce8246cba9d2624439f76b51b1314e0
parentedbdf42bbfda9c87246d8142574ce15b36ccd6a8
parent24354bdadcf8d0f9d2966d1348b41db6abce85b2
[dali_1.3.14] Merge branch 'devel/master'

Change-Id: Iaa04190b75f5c5c2ab296d14435c6980badb64bc