diff options
| author | Jeff Hamilton <jham@google.com> | 2010-02-03 21:36:48 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-03 21:36:48 -0800 |
| commit | 1298bfc6a4ab566d7fae2596a0ae73d082ef6da3 (patch) | |
| tree | 5e020733a5a8fce5d5aea1f298231357643ae66d /src/com/android/browser | |
| parent | 82c1baa16a66eabdd7fd1eb6569e61cb6caac4fd (diff) | |
| parent | 4db482f37c2d246c0fdc6a64b4320a04229e2c09 (diff) | |
| download | packages_apps_Browser-1298bfc6a4ab566d7fae2596a0ae73d082ef6da3.tar.gz packages_apps_Browser-1298bfc6a4ab566d7fae2596a0ae73d082ef6da3.tar.bz2 packages_apps_Browser-1298bfc6a4ab566d7fae2596a0ae73d082ef6da3.zip | |
Merge "This should fix the build."
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/BrowserProvider.java | 2 | ||||
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/browser/BrowserProvider.java b/src/com/android/browser/BrowserProvider.java index 33396a0c2..f32866d4b 100644 --- a/src/com/android/browser/BrowserProvider.java +++ b/src/com/android/browser/BrowserProvider.java @@ -50,7 +50,7 @@ import android.util.TypedValue; import com.android.common.Patterns; -import com.google.android.providers.GoogleSettings.Partner; +import com.google.android.gsf.GoogleSettingsContract.Partner; import java.io.File; import java.io.FilenameFilter; diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 941b28b8a..1e282c643 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -17,7 +17,7 @@ package com.android.browser; -import com.google.android.providers.GoogleSettings.Partner; +import com.google.android.gsf.GoogleSettingsContract.Partner; import android.app.ActivityManager; import android.content.ContentResolver; |