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


Trivial merge