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


Trivial merge