diff options
| author | Tom Taylor <tomtaylor@google.com> | 2009-12-22 10:11:55 -0800 |
|---|---|---|
| committer | Tom Taylor <tomtaylor@google.com> | 2009-12-22 10:11:55 -0800 |
| commit | f0108cda21bec61418b24aa6217406072780b5d5 (patch) | |
| tree | 8866dfdec50a4bff63f188784779f7e1a9aa0216 /packages/SettingsProvider | |
| parent | fddd8f96f34b622cbdd0d891f8a7f5b7e18fdbf8 (diff) | |
| parent | ad2fa35d888e0763bfef0fc060775bec5d169479 (diff) | |
| download | frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.zip frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.tar.gz frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.tar.bz2 | |
resolved conflicts for merge of ad2fa35d to master
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 1a64e20..e28e915 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -39,7 +39,7 @@ import android.text.TextUtils; import android.util.Config; import android.util.Log; import android.util.Xml; -import com.android.internal.util.XmlUtils; +import com.android.common.XmlUtils; import com.android.internal.telephony.RILConstants; import com.android.internal.widget.LockPatternUtils; |