From: Bocklage, Jens <Jens_Bocklage@mentor.com>
Date: Thu, 22 Dec 2016 12:34:02 +0000 (+0100)
Subject: Merge branch 'master' of https://gerrit.automotivelinux.org/gerrit/p/staging/HomeScreen
X-Git-Tag: 3.0.0~7
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2FHomeScreen.git;a=commitdiff_plain;h=482d3b93a673f11ea8aa295a7d77db890d100665

Merge branch 'master' of https://gerrit.automotivelinux.org/gerrit/p/staging/HomeScreen

Conflicts:
	HomeScreen/src/applicationmodel.cpp
---

482d3b93a673f11ea8aa295a7d77db890d100665