[dali_1.1.7] Merge branch 'devel/master' 38/50038/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:00:56 +0000 (11:00 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 23 Oct 2015 10:00:56 +0000 (11:00 +0100)
commit06dbfd61c60e48ef76df748e2d1b2adb45d16adf
tree53400f21809e9b0baaef1e61f16863f7861b4b20
parentc60cf195a6700e2f56816ddf36e4b3b8bb3fbc39
parenta2e8bb5ae477db47fcc9ced25ddb71f78f927acd
[dali_1.1.7] Merge branch 'devel/master'

Change-Id: I0581bbf461196da7d6cb6e9b6294dc76d5505885