tree b01fb648b54acec49051cc901c527696ea78f341
parent b749a83a5017b583ddff48888ab84ed04e93c0c0
parent f17e6dbdf6fec14b92f715fafaae694b005e5843
author Maarten Derks <maarten@fairphone.com> 1457086678 +0100
committer Maarten Derks <maarten@fairphone.com> 1457086678 +0100

Merge remote-tracking branch 'fp2-dev/fp2-dev-v2'

Conflicts:
	src/com/fairphone/updater/UpdaterService.java
	src/com/fairphone/updater/data/VersionParserHelper.java