[dali_1.2.5] Merge branch 'devel/master' 17/87817/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 9 Sep 2016 13:02:56 +0000 (14:02 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 9 Sep 2016 13:02:56 +0000 (14:02 +0100)
commitd8e8f7de1ff30edb599d422b7a0bc2ae259f4ee5
treebce94ef03da07dc9e8e86631b991ae6e6d3b1ec6
parent67e706595574ed0fd25385890ed17521f6c3cfde
parent0dfc1437d62f28c01e53243f99a084c4401fa415
[dali_1.2.5] Merge branch 'devel/master'

Change-Id: Ica8b77154dddfba0ef4121ee7ba446ae9df18e7d