[dali_1.2.18] Merge branch 'devel/master' 44/103844/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 9 Dec 2016 14:36:00 +0000 (14:36 +0000)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 9 Dec 2016 14:36:00 +0000 (14:36 +0000)
Change-Id: I0a5d92c96e190d53ab4f88e8ca034ce8d8f491be


Trivial merge