[dali_1.1.31] Merge branch 'devel/master' 74/66974/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:46 +0000 (10:08 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:46 +0000 (10:08 +0100)
commit28946d814d1f11fddcc23a887a0e318133147549
tree971164266d6c35ecd4d70bf5453def45ff17de51
parent6081c160daa8cac70730dfe0e927cc7de8c38207
parenta6f263a7f6a737ab5df3491695255c9e3e4ff03b
[dali_1.1.31] Merge branch 'devel/master'

Change-Id: I8e33dff765707e009f85c8d98d791a435ac5ef4a