[dali_1.1.3] Merge branch 'devel/master' 56/48356/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:50 +0000 (11:03 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:50 +0000 (11:03 +0100)
commita2cfdf761c681e729847c2b64c742d87ada8c6c5
tree6f4038031c6d0901ef03edc5c16d5d88ed1fa782
parent243ad18f462d5c6b0d48ea13ff9918bcd9233e99
parent9acf87a22629a7258c6b669a40fe54da73e8bdae
[dali_1.1.3] Merge branch 'devel/master'

Change-Id: I75388697198ce58d653791a600d0cfb233cd9c5d