[dali_1.1.34] Merge branch 'devel/master' 98/69498/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 13 May 2016 10:55:13 +0000 (11:55 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 13 May 2016 10:55:13 +0000 (11:55 +0100)
commit651a66a2dfe9c92d669c1ba6a7e192ca1fff8085
tree30569cd64f913e2ffa1f83fbc013164c9a4a6751
parent24b12e194dc413aa0f436447ae8c9ce42f7ee18c
parent20ef99629dfbb184d0691fff8fbeb58f0d4a795b
[dali_1.1.34] Merge branch 'devel/master'

Change-Id: I14b4fd62bd80d70a853c8d67a186a0294c93f9f6