commit d4eead18d460ee3b4f911bf93078158194bb252c
author Kenny Root <kroot@google.com> Tue Mar 30 09:31:17 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 30 09:31:17 2010 -0700
tree e318daaf9cfabb44f24394a76a3735876a1484d6
parent 3fb9f349a60eadbdfce6c9b6ffb1cf59a6cd7640
parent 51645e75fe6e0bc8e47be42b8ff57834a8a4f1f8

Merge "Import revised translations" into froyo

src/com/android/im/app/DatabaseUtils.java

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;
 

src/com/android/im/imps/ImpsPresenceUtils.java

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;

src/com/android/im/imps/StandardPasswordDigest.java

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;