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


Trivial merge