[dali_1.2.19] Merge branch 'devel/master' 49/105449/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 16 Dec 2016 13:20:22 +0000 (13:20 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 16 Dec 2016 13:20:22 +0000 (13:20 +0000)
Change-Id: I4a21755439792cc42829074d7219e17436bb45ff


Trivial merge