[dali_1.2.2] Merge branch 'devel/master' 80/84580/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 09:59:58 +0000 (10:59 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 09:59:58 +0000 (10:59 +0100)
Change-Id: I9621d13767bfb5ca17d71764bac7c16500af5e49


Trivial merge