[dali_1.1.13] Merge branch 'devel/master' 93/53393/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 4 Dec 2015 11:03:54 +0000 (11:03 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 4 Dec 2015 11:03:54 +0000 (11:03 +0000)
commitc55660c249e1ebe67719430e59face412974e475
treeea1c16181359a07006bcbbb1db60082ccf25c082
parenta04da9d39fde32683f671c76be02dab5e60abe0d
parent37a9fafe145c2facabad845144aa681d3338afdd
[dali_1.1.13] Merge branch 'devel/master'

Change-Id: I7fa7ecc066846b9e63ac604d7034872cef9a4bd8