commit 6d283dc3d85ddc7e546ce6eb19b9b1b28320291c
author Maarten <maarten@fairphone.com> Thu Jun 16 13:05:16 2016 +0000
committer Maarten <maarten@fairphone.com> Thu Jun 16 13:05:16 2016 +0000
tree fe35855757d897c44931b8dec60c4e328b490f9a
parent 0eacd77fe2bdaab928aba2dcfe579f1e6f08c8c9
parent 90fa3f9819c2dd7ca1c576ad29cd62411df1190c

Merge branch 'fp2-2000' into 'master'

FPII-2000: Fairphone Updater app itself should use clear version numbering

Make the build system version the Updater.

See merge request !24

app/src/main/AndroidManifest.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 92867d9..eec63b7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="com.fairphone.updater"
-    android:versionCode="31"
-    android:versionName="31" >
+          package="com.fairphone.updater" >
 
     <uses-sdk
         android:minSdkVersion="17"