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


Trivial merge