tree c091b1de458da77a382a1ffee4df6ef4f8b3d84b
parent a305378bd1696a68e045d8dd3b57ad8ddbcade7a
author Gustaf Lundh <gustaflh@axis.com> 1447273451 -0800
committer Gustaf Lundh <gustaflh@axis.com> 1447273495 -0800

Fix build errors against master

Change-Id: I00e6160a90c18f36a7669371ab9ec1fe93686e89