commit 5724cc331d66b0a7b4f74cfea65cbe419162eec6
author Yi Kong <yikong@google.com> Thu Mar 10 16:50:02 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 10 16:50:02 2016 +0000
tree ffaaebc01db69d2ee02f5ca7af6dada4c655e4b1
parent 06ce16a54c971e922d9e34cc5a57f012614db20f
parent 40f79bb542c9028fe998a111555626af78bb86ce

Merge "Track libcore change b695412b529c8dced105867c6d9d7fd463a67714"

core/java/android/preference/SeekBarPreference.java

diff --git a/core/java/android/preference/SeekBarPreference.java b/core/java/android/preference/SeekBarPreference.java
index 67f6409..dbe9f4b 100644
--- a/core/java/android/preference/SeekBarPreference.java
+++ b/core/java/android/preference/SeekBarPreference.java
@@ -79,11 +79,6 @@
     }
 
     @Override
-    public CharSequence getSummary() {
-        return null;
-    }
-
-    @Override
     protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
         setProgress(restoreValue ? getPersistedInt(mProgress)
                 : (Integer) defaultValue);