[dali_1.0.46] Merge branch 'devel/master' 37/42237/1
authorChu Hoang <c.hoang@samsung.com>
Wed, 24 Jun 2015 14:54:49 +0000 (15:54 +0100)
committerChu Hoang <c.hoang@samsung.com>
Wed, 24 Jun 2015 14:54:49 +0000 (15:54 +0100)
commit9ff918e3bbc5b9d668dd428a43ce223a65360b92
tree0032213ed4ab8a5406f766a8cda1e1eb48438b9a
parent5eabcec47245dd444b99a90bb9ebb86ec4881ed1
parent8fe9a060eb368923be786c0b0e2cd1ba84f823ac
[dali_1.0.46] Merge branch 'devel/master'

Change-Id: Id16ef6d81fb4ae2e54dfb00df78f9ff3244c4381