[dali_1.2.19] Merge branch 'devel/master' 49/105449/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 16 Dec 2016 13:20:22 +0000 (13:20 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 16 Dec 2016 13:20:22 +0000 (13:20 +0000)
commitfee9b7f1720a901d55cc317742230ee2bd170121
tree502b48565409590ea396b343f32093ef1bb1150e
parent1c22c6c9a0320744e3cfa06ef3c860c9095fb057
parent0af0b7ccbdb5b9c0c7cff8ba5e8aad7a2c275fcd
[dali_1.2.19] Merge branch 'devel/master'

Change-Id: I4a21755439792cc42829074d7219e17436bb45ff