commit 04c0816541080d46f70803b58ce8666098f7089a
author Fan Zhang <zhfan@google.com> Wed Sep 27 10:23:23 2017 -0700
committer Fan Zhang <zhfan@google.com> Wed Sep 27 12:08:56 2017 -0700
tree 5aaf3351e7587f8ee5b54e953abeae51cf314ad1
parent 3f7535a8c62e98f1e21e1029235967b2deda241e

Sync to latest SettingsIntelligence source code

Test: builds & robotests
Change-Id: Ie83909a9747afd07c541c6236224f079da8a2dc9

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1791d3f..76a9c68 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,7 +23,7 @@
 
     <application
         android:label="@string/app_name_settings_intelligence"
-        android:icon="@drawable/ic_launcher_settings_intelligence">
+        android:icon="@mipmap/ic_launcher">
         <service
             android:name=".suggestions.SuggestionService"
             android:exported="true"