[dali_1.1.8] Merge branch 'devel/master' 12/50512/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 29 Oct 2015 10:32:18 +0000 (10:32 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 29 Oct 2015 10:32:18 +0000 (10:32 +0000)
commitffa129a0121fccb27783ccbf5d9d32bee9de2aec
treef81212d6d673914817e0997e7766114d2d05e841
parent06dbfd61c60e48ef76df748e2d1b2adb45d16adf
parent60365b9edc65a7b4bb8d6f1febe1ea91978aad23
[dali_1.1.8] Merge branch 'devel/master'

Change-Id: I4c439af8c8919e8bdae55fa19273508035212510