[dali_1.3.14] Merge branch 'devel/master' 13/171413/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 2 Mar 2018 11:52:18 +0000 (11:52 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 2 Mar 2018 11:52:18 +0000 (11:52 +0000)
commitc242bb57967a8537ceaab888b1ad70147e13a8a1
tree51d9724f2d0e228939e5dfa2e430cb0c75b46e61
parent78baff0336bd8bb51829a84d9d316fa9b627ea6e
parentef5ec53a27b4591602f9cd116a80259a43990932
[dali_1.3.14] Merge branch 'devel/master'

Change-Id: I2f5c048692d9b39b752497c962fcabd588b82df4