[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)
commitcdd369d89e13e0d972309eebf4fe5ecb57e5dd84
treef91619bd731601045fef47a7edbea0ceffc895fa
parentcdc8674ed30780c66be93cd712a4932c8443c252
parent424a275a198c93812454be4579f2a8390f808411
[dali_1.1.5] Merge branch 'devel/master'

Change-Id: I2e16bbff8532a10e8b997abc1e536343c12bd737