| Index: blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java | 
| diff --git a/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java b/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java | 
| index 368058d4adcb418eaeeb8ec2fe4c313d4f9daf35..cff5df6d60f2b196f795504fa3f0ce3cb04cf6a5 100644 | 
| --- a/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java | 
| +++ b/blimp/client/core/android/java/src/org/chromium/blimp/core/DummyBlimpClientContext.java | 
| @@ -10,7 +10,6 @@ import org.chromium.base.annotations.CalledByNative; | 
| import org.chromium.base.annotations.JNINamespace; | 
| import org.chromium.blimp_public.BlimpClientContext; | 
| import org.chromium.blimp_public.BlimpClientContextDelegate; | 
| -import org.chromium.blimp_public.BlimpSettingsCallbacks; | 
| import org.chromium.blimp_public.contents.BlimpContents; | 
|  | 
| /** | 
| @@ -59,12 +58,10 @@ public class DummyBlimpClientContext implements BlimpClientContext { | 
| } | 
|  | 
| @Override | 
| -    public void attachBlimpPreferences( | 
| -            PreferenceFragment fragment, BlimpSettingsCallbacks callbacks) {} | 
| +    public void attachBlimpPreferences(PreferenceFragment fragment) {} | 
|  | 
| @Override | 
| -    public void setDelegate(BlimpClientContextDelegate delegate) { | 
| -    } | 
| +    public void setDelegate(BlimpClientContextDelegate delegate) {} | 
|  | 
| @Override | 
| public void connect() {} | 
|  |