[dali_1.1.3] Merge branch 'devel/master' 53/48353/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:31 +0000 (11:03 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:31 +0000 (11:03 +0100)
commit579e700d63e319e112613b33845f76e8d060d2dd
treefa30abac1364e4542282ba90e728a55aa8457ff3
parente8036aef3135aa8df25ece1c6dea6df812a34a92
parentd2119dcb154a91d0f76a3084bf41aea7c9c7ddc8
[dali_1.1.3] Merge branch 'devel/master'

Change-Id: I523c4ba76a358ac222e9f8c14586df384b9fc2ae