keys.scala, etc.: Make merging public keys have a progress bar.

[tripe-android] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 85cac4baeebb0035f44fe29390f621b0a67d5f9b..2f6372115168cc7893b9c6b2f67b32ea58d2bf58 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,13 +6,12 @@
     android:installLocation="internalOnly">
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23"/>
 
   <application
       android:icon="@drawable/icon"
-      android:label="@string/app_name">
+      android:label="@string/auto_package">
     <activity
-       android:label="@string/app_name"
+       android:label="@string/auto_package"
        android:name=".ToyActivity">
       <intent-filter>
        <action android:name="android.intent.action.MAIN"/>