[dali_1.1.2] Merge branch 'devel/master' 65/47965/1
authorRichard Huang <r.huang@samsung.com>
Thu, 10 Sep 2015 10:05:55 +0000 (11:05 +0100)
committerRichard Huang <r.huang@samsung.com>
Thu, 10 Sep 2015 10:05:55 +0000 (11:05 +0100)
commit597b4e6dd665427be7d64db0ccbf873aafc16f52
tree25d8fa44ae6c6539c3d4d930500ec1670c3e70a6
parentef3158159e827347a70e29e2c234e2eb0917f4b6
parent65c55f19728573c45c5d3f4511154b08e1c2a295
[dali_1.1.2] Merge branch 'devel/master'

Change-Id: I317675a6ab0e39a31f265800b51c1849fed8a28c