[dali_1.2.21] Merge branch 'devel/master' 49/109049/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jan 2017 14:02:16 +0000 (14:02 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jan 2017 14:02:16 +0000 (14:02 +0000)
commit483ee611c7cf108f4b1ac85f42636fdbf7067c2b
tree166ab88d9a8811cd311ae78823f29c79dcab7711
parent8ab0decf971a6605ded520fe0a636a1a0affdf2e
parentd93cd39e264dac04ce2c57e9eaa057be9fe390ad
[dali_1.2.21] Merge branch 'devel/master'

Change-Id: I1c1490d73b64bf8960a0940b2cee663d7d608526