Merge branch 'devel/master' into devel/new_vr 23/92623/1 devel/new_vr
authorTom Robinson <tom.robinson@samsung.com>
Mon, 17 Oct 2016 15:11:02 +0000 (16:11 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Mon, 17 Oct 2016 15:13:04 +0000 (16:13 +0100)
commit30ba92fe234fa182e91fc4c26774ad6e5a78d029
treeb0b34e8c864c4dd5c2df7175950b94aaf3ac169e
parent651cf4ef88cfffe1508e1be61f05378e8925eb69
parent0de4495ae0ad22b60ce3d1257e30628ea518f377
Merge branch 'devel/master' into devel/new_vr

Change-Id: I986b0d645926ca98da916e6480865769fbe01d64