[dali_1.3.14] Merge branch 'devel/master' 10/171410/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 2 Mar 2018 11:51:42 +0000 (11:51 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 2 Mar 2018 11:51:42 +0000 (11:51 +0000)
commit95afeff364735d49c26422e2875dd638b082954a
treebcc08cc6c88dc4a5b063722a2e32967411419e98
parent9c13280077ca3ef36e3ccc60c9c7c1b06c0bbcea
parent6d2c87ca82714665ec5fbc51df2bb9a25900358c
[dali_1.3.14] Merge branch 'devel/master'

Change-Id: I46f7f3068a1ebf08c4d211422b23651d58acab7e