Merge branch 'devel/master' into devel/new_vr 19/92619/3 devel/new_vr
authorTom Robinson <tom.robinson@samsung.com>
Mon, 17 Oct 2016 14:54:30 +0000 (15:54 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Mon, 17 Oct 2016 15:08:18 +0000 (08:08 -0700)
commite54ce004c50f11d39f116eb4e8461ce9a4ab6243
tree85199bbf8e89f5342b689d4c38fb38daa48f4a5f
parent11c624892a38779bc0092636281daeb3985fc88c
parent505564fecee5b1faf8d978b056aa10ce15c49c03
Merge branch 'devel/master' into devel/new_vr

Change-Id: Ib4c065e28a3303222308b0791e09d5e999caa049
dali/internal/update/manager/update-manager.h