[dali_1.1.31] Merge branch 'devel/master' 72/66972/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:30 +0000 (10:08 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:30 +0000 (10:08 +0100)
commit604f04c4e28ef6ae9c7d5e4ee783fbd133456dd5
tree71e6fdc6e4df25cc7977af64b60fe8cf6d8c6ca0
parentd1ae922e5a989a49f7e3410fd91f69ad94e828e8
parente0f39b3a57ea81fb0fe1419897b267b7a9ded058
[dali_1.1.31] Merge branch 'devel/master'

Change-Id: I3fc21172bd752ac9adaaece486f398b3a11e21ac