[dali_1.2.18] Merge branch 'devel/master' 45/103845/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 9 Dec 2016 14:36:08 +0000 (14:36 +0000)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 9 Dec 2016 14:36:08 +0000 (14:36 +0000)
commitad2c68be894854b5dd91295039afebc21e659c3a
tree47d3b40b638de39e486d77085d22d97980f5e03d
parent769d8e2c71710cc33eb6512682887eb2a05a64d9
parentb7e8fc2502ba9f29cdba74f98dc7a24e97e3eda9
[dali_1.2.18] Merge branch 'devel/master'

Change-Id: Iace460d2600b73182e9a7cdfc365ca277559a4e5