[dali_1.1.29] Merge branch 'devel/master' 24/65324/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 8 Apr 2016 10:25:01 +0000 (11:25 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 8 Apr 2016 10:25:01 +0000 (11:25 +0100)
commitdcbe581a107fdda950cca57f70dd759f01b74762
tree287a2953265472c140ae1bc9b8b6e73e53a6f729
parent9f4878dd3cf496d4f10d6e4e73f311d1c8c29672
parent591a96a1f0757e046bda3cd390e5c5e622c24930
[dali_1.1.29] Merge branch 'devel/master'

Change-Id: If4b6c574c8b9ff539302e43f9f564c9be1181891