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


Trivial merge