[dali_1.0.49] Merge branch 'devel/master' 58/44158/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 17 Jul 2015 08:26:22 +0000 (09:26 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 17 Jul 2015 08:26:22 +0000 (09:26 +0100)
commitee35102ced098adb56cb19a9fc0e2da831807d8e
tree03b254644ec01dce45a85e9cdf394ad9dde49ae6
parentad1313b2bb8ee3449d4faea7340cc8c2fbedf40f
parent2cc3286222e656e61be7b600845b6bc7cba6e27e
[dali_1.0.49] Merge branch 'devel/master'

Change-Id: Ieaa69fde05176af58de6161fdce4b9dd80fd5ffb