From 8d69f57e2a26d7c5ef8d6cd96478bb19384e53e7 Mon Sep 17 00:00:00 2001
From: Eric Marcoux <erifsx@gmail.com>
Date: Fri, 25 Mar 2016 11:52:48 -0400
Subject: [PATCH] Removes label and icon from application tag in android_10's
 manifest file.  Makes the android studio manifest merger not require the use
 of a tools:replace="android:icon" call for using a personal icons and makes
 use of library projects less problematic for the same reason.

---
 android_10/AndroidManifest.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/android_10/AndroidManifest.xml b/android_10/AndroidManifest.xml
index e04d5c24..ced3fcdc 100644
--- a/android_10/AndroidManifest.xml
+++ b/android_10/AndroidManifest.xml
@@ -11,9 +11,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application
-        android:icon="@mipmap/icon"
-        android:label="@string/app_name">
+    <application>
         <activity
             android:name="org.ros.android.MasterChooser"
             android:label="@string/app_name"