commit 366bb5b7d97d467b8b3365a307a8727e3e84702d
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 11 00:04:11 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 11 00:04:12 2017 +0000
tree cfc2c7ac0bdf95324a339473d11e9b9a6c1d31a8
parent c68d1bd380d2c1eec8c4f5fb311f210b0662629f
parent bfd11313cb3103c6c616ef9c6720138142a62ff4

Merge "Update the Storage settings text."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 776c4ec..b04182f2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3092,7 +3092,7 @@
         </activity-alias>
 
         <activity android:name=".Settings$StorageDashboardActivity"
-                  android:label="@string/storage_settings_2"
+                  android:label="@string/storage_settings"
                   android:icon="@drawable/ic_settings_storage">
             <intent-filter android:priority="5">
                 <action android:name="com.android.settings.action.SETTINGS" />

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0f8f762..b9e9c1c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8019,7 +8019,4 @@
     <!-- Preference label for the Files storage section. [CHAR LIMIT=50] -->
     <string name="storage_files">Files</string>
 
-    <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
-    <string name="storage_settings_2" >Phone Storage</string>
-
 </resources>