Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f189627..e09a9d4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3004,7 +3004,7 @@
</activity>
<activity android:name="Settings$AutomaticStorageManagerSettingsActivity"
- android:exported="@bool/config_has_storage_manager"
+ android:exported="@bool/config_storage_manager_settings_enabled"
android:label="@string/automatic_storage_manager_settings"
android:taskAffinity="">
<intent-filter android:priority="1">
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 71923ea..13609dc 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -43,9 +43,6 @@
<!-- Whether none security option is hide or not (country specific). -->
<bool name="config_hide_none_security_option">false</bool>
- <!--Whether the storage manager exists. -->
- <bool name="config_has_storage_manager">false</bool>
-
<!--Whether help links are defined. -->
<bool name="config_has_help">false</bool>
</resources>