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


Trivial merge