[dali_1.1.7] Merge branch 'devel/master' 39/50039/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:00:59 +0000 (11:00 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:01:00 +0000 (11:01 +0100)
commit99d04e7ae5ea38bdbe4f211d9e2592d3422ae8af
treed44b78dbb9b3739caae7062f6f3be30d6b6e5894
parent10967b843a1ab64b10f8a8e1c7757657b9ddba9a
parent112aa6778c0b7fe0f9af0b2988802f2ff12fa60d
[dali_1.1.7] Merge branch 'devel/master'

Change-Id: I51e2dd26cb5e210757d50acdfe40e664cc572206