[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)
Change-Id: I2f5c048692d9b39b752497c962fcabd588b82df4


Trivial merge