[dali_1.3.4] Merge branch 'devel/master' 38/164138/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:39 +0000 (11:19 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:39 +0000 (11:19 +0000)
Change-Id: I8b2c926831491d5d3ad2c01bc91bf0daf965a80f


Trivial merge