[dali_1.0.46] Merge branch 'devel/master' 40/42240/1
authorChu Hoang <c.hoang@samsung.com>
Wed, 24 Jun 2015 14:55:07 +0000 (15:55 +0100)
committerChu Hoang <c.hoang@samsung.com>
Wed, 24 Jun 2015 14:55:07 +0000 (15:55 +0100)
commit9e2bbf21d3595e38f59e3cdd723f2598d7f80efa
tree31eb9239bc8547a7e2c0bc8d687d7ea427a012ce
parent3c6c1b2687725e195b295da9c33cbca6969f1a8a
parent004186eed77c98713b01bde4cdfce1e68187dcba
[dali_1.0.46] Merge branch 'devel/master'

Change-Id: I84b588ac741620f9c1796a1c68016ffafaf88fc8