Merge "Import revised translations" into froyo
diff --git a/src/com/android/im/app/DatabaseUtils.java b/src/com/android/im/app/DatabaseUtils.java
index 417206a..cab41f2 100644
--- a/src/com/android/im/app/DatabaseUtils.java
+++ b/src/com/android/im/app/DatabaseUtils.java
@@ -30,7 +30,7 @@
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.util.Log;
-import android.util.base64.Base64;
+import android.util.Base64;
import java.util.Map;
diff --git a/src/com/android/im/imps/ImpsPresenceUtils.java b/src/com/android/im/imps/ImpsPresenceUtils.java
index 3703874..ff561f2 100644
--- a/src/com/android/im/imps/ImpsPresenceUtils.java
+++ b/src/com/android/im/imps/ImpsPresenceUtils.java
@@ -20,7 +20,7 @@
import com.android.im.engine.Presence;
import com.android.im.plugin.PresenceMapping;
-import android.util.base64.Base64;
+import android.util.Base64;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/src/com/android/im/imps/StandardPasswordDigest.java b/src/com/android/im/imps/StandardPasswordDigest.java
index dce12f7..0ec9a00 100644
--- a/src/com/android/im/imps/StandardPasswordDigest.java
+++ b/src/com/android/im/imps/StandardPasswordDigest.java
@@ -21,7 +21,7 @@
import com.android.im.plugin.PasswordDigest;
import android.security.MessageDigest;
-import android.util.base64.Base64;
+import android.util.Base64;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;