Use gradle project layout

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "UnifiedNlpApi"]
-	path = UnifiedNlpApi
-	url = https://github.com/microg/android_external_UnifiedNlpApi.git

build.gradle

@@ -30,23 +30,13 @@ repositories {
 }
 
 dependencies {
-    compile project(':UnifiedNlpApi')
+    compile 'org.microg:unifiednlp-api:1.3.2'
     compile 'com.android.support:support-v4:22.0.0'
 }
 
 android {
     compileSdkVersion 22
     buildToolsVersion "22.0.0"
-    lintOptions.abortOnError false
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            res.srcDirs = ['res']
-        }
-    }
 }
 
 if (file('user.gradle').exists()) {

AndroidManifest.xml → src/main/AndroidManifest.xml

@@ -15,8 +15,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.microg.nlp.backend.ichnaea"
-    android:versionCode="1002"
-    android:versionName="0.10.2">
+    android:versionCode="10000"
+    android:versionName="1.0.0">
 
     <uses-sdk
         android:minSdkVersion="10"

res/values/strings.xml → src/main/res/values/strings.xml

@@ -29,7 +29,7 @@
     <string name="pref_title_use_wifis">Use Wi-Fi</string>
     <string name="pref_description_use_wifis">Whether to send Wi-Fi data to the geolocation service</string>
     <string name="pref_title_use_cells">Use Cell (GSM/UMTS/LTE/CDMA)</string>
-    <string name="pref_description_use_cells">Whether to send Cell data to the geolocation service.\nThis requires atleast Android 4.2 and does not work properly on all devices.</string>
+    <string name="pref_description_use_cells">Whether to send Cell data to the geolocation service.\nThis requires Android 4.2 or later.</string>
 
     <string name="first_time_notification_title">Contribute to Mozilla Location Service</string>
     <string name="first_time_notification_content"><![CDATA[ Mozilla Location Service is a free, user-powered location database.<br>