[dali_1.2.34] Merge branch 'devel/master' 98/123898/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 7 Apr 2017 10:12:04 +0000 (11:12 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 7 Apr 2017 10:12:04 +0000 (11:12 +0100)
commitdfc52dd91d794065546f0d816703eed19cc8c32b
treeffe9aab8eab39f34e9a2b38bc6bb937d8ce0f9c6
parentdc905a560d55a894e0cc60bd3eed0cd4c5e5e4f8
parentc63fa9342c4adb8a438368dc6757b7ae9a760a08
[dali_1.2.34] Merge branch 'devel/master'

Change-Id: I3e08898386d70912a0b784dc4ae5a67f6c1847ba