[dali_1.2.9] Merge branch 'devel/master' 62/91462/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:34:07 +0000 (16:34 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 7 Oct 2016 15:34:07 +0000 (16:34 +0100)
Change-Id: I22f7ca621b2329dc94c445a3330a646bc6d585c5


Trivial merge