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


Trivial merge