[dali_1.1.5] Merge branch 'devel/master' 79/48979/1
authorChu Hoang <c.hoang@samsung.com>
Fri, 2 Oct 2015 09:39:14 +0000 (10:39 +0100)
committerChu Hoang <c.hoang@samsung.com>
Fri, 2 Oct 2015 09:39:14 +0000 (10:39 +0100)
Change-Id: I2e16bbff8532a10e8b997abc1e536343c12bd737


Trivial merge