[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)
commit4f32d658dffcb42d6620e8375e9a85ad7deb7582
treef3f7a488fe38cf267e61dbb60db2ac70bfbb6e16
parent9be971fdcae709f8d55f6d9c5670da2c9b54afb9
parentaadc485fba32897c687bbf863b2d5f1db2c39b57
[dali_1.1.5] Merge branch 'devel/master'

Change-Id: I8fb10ef87ae58259188b1d3164f86e2efdabd533