[dali_1.2.1] Merge branch 'devel/master' 48/83848/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:20 +0000 (11:41 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:20 +0000 (11:41 +0100)
commitd0641c99b5f097f199f6526881da79632c5ccaab
tree4b7c943247b8927403b1244e84476a7a118ff60f
parent3959bc9a9dd9a71bcba9c6603b1aeed7249c927b
parentb76b6d75f24b2e0ee545ecaab93381cec85654d5
[dali_1.2.1] Merge branch 'devel/master'

Change-Id: I74540167a23dcc6bdb0edacd23eab2484ec32b32