Merge remote-tracking branch 'fp2-dev/fp2-dev-v2'
Conflicts:
src/com/fairphone/updater/UpdaterService.java
src/com/fairphone/updater/data/VersionParserHelper.java
diff --git a/src/com/fairphone/updater/UpdaterService.java b/src/com/fairphone/updater/UpdaterService.java
index 6a669cc..598bc4b 100644
--- a/src/com/fairphone/updater/UpdaterService.java
+++ b/src/com/fairphone/updater/UpdaterService.java
@@ -152,7 +152,7 @@
PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0);
- NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context).setSmallIcon(R.drawable.updater_white)
+ NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context).setSmallIcon(R.drawable.updater_white)
.setContentTitle(context.getResources().getString(R.string.app_full_name))
.setContentText(context.getResources().getString(R.string.appStoreReinstall))
.setAutoCancel(true)