Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev

res/xml/display_settings.xml

@@ -59,7 +59,7 @@
 
     <DropDownPreference
         android:key="auto_rotate"
-        android:summary="%s"
+        android:summary="@string/summary_placeholder"
         android:title="@string/display_auto_rotate_title" />
 
     <Preference

src/com/android/settings/display/AutoRotatePreferenceController.java

@@ -45,6 +45,7 @@ public class AutoRotatePreferenceController extends PreferenceController impleme
     public void updateState(Preference preference) {
         final DropDownPreference rotatePreference = (DropDownPreference) preference;
         final int rotateLockedResourceId;
+        preference.setSummary("%s");
         // The following block sets the string used when rotation is locked.
         // If the device locks specifically to portrait or landscape (rather than current
         // rotation), then we use a different string to include this information.