[dali_1.1.13] Merge branch 'devel/master' 91/53391/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 4 Dec 2015 11:03:33 +0000 (11:03 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 4 Dec 2015 11:03:33 +0000 (11:03 +0000)
commit0dea44b56b4aac8cad609fdca6e7fbec9fb5aa03
tree8f42dfb90356e11abffa2dc40075ce2c07b61832
parent636d837d78320c5c3aa33e30fbca2a81e87971e2
parent5ab3b0b3ae8f7cb25f6f0f6b73dd998c2f18ef74
[dali_1.1.13] Merge branch 'devel/master'

Change-Id: I68e087c61e44501edc254c781ed4b34bf48e0dbc