[dali_1.2.12] Merge branch 'devel/master' 73/94373/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 28 Oct 2016 12:19:18 +0000 (13:19 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 28 Oct 2016 12:19:18 +0000 (13:19 +0100)
commit20dc7bbe285c1143911f2103af3bcb8de6fad985
tree5fd3d20961eb4e2bbc48fdddbd8455f02c989eb9
parent4cd0c17c9421378d74fe95d1bd2970d84a9d9453
parent87b66bedcb44d98c56a00e79ae952c4f763165dd
[dali_1.2.12] Merge branch 'devel/master'

Change-Id: Icdce160338bab16c9065ef87108b8031f0df8aec