Merge "Fix issue for Preference.setSingleLineTitle() has no effect." into oc-dr1-dev

am: 18f3adc03a

Change-Id: I04b7160390a4c3cdee6f0355e3aeb0fdee0a4719

core/java/android/preference/Preference.java

@@ -934,6 +934,7 @@ public class Preference implements Comparable<Preference> {
      * @param singleLineTitle set {@code true} if the title should be constrained to one line
      */
     public void setSingleLineTitle(boolean singleLineTitle) {
+        mHasSingleLineTitleAttr = true;
         mSingleLineTitle = singleLineTitle;
         notifyChanged();
     }