[dali_1.2.1] Merge branch 'devel/master' 49/83849/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:26 +0000 (11:41 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 12 Aug 2016 10:41:26 +0000 (11:41 +0100)
commitcdcb983253af9ef387c1c2ecec248da744ebdd8b
treeed46333fc06f3d7a0ef663052279da34565b5415
parent00ebda5fab064cf63e55cccfbd7892b0e4ecd93a
parent2bef0560156c1ac5431ebaaa500c705b8e878eb5
[dali_1.2.1] Merge branch 'devel/master'

Change-Id: I09bc8c2b6dcdb5ff4d3e9e5252a5f285c9908c96