commit | 3f3695df2e974811a5759d43f3532dcd9d6be26c | [log] [tgz] |
---|---|---|
author | Tobias Thierer <[email protected]> | Thu Sep 08 13:29:25 2016 +0000 |
committer | android-build-merger <[email protected]> | Thu Sep 08 13:29:25 2016 +0000 |
tree | 9b47e0f542bdfaebf621a23089559a93f78cff89 | |
parent | f13853ff0fa5eb65afc847176e55ca6db293eb3c [diff] | |
parent | e59fe5a2e1adf3b550f9a81850f76b1dfa791973 [diff] |
Disambiguate Base64 import in ksoap2. am: a3e5f27c89 am: 949b793ca5 am: e59fe5a2e1 Change-Id: Ib733f87eb11acf5ba248b89f74a85c8ce9b9f7ef
diff --git a/kobjects/org/ksoap2/kobjects/mime/Decoder.java b/kobjects/org/ksoap2/kobjects/mime/Decoder.java index dadc90e..e65cdcf 100644 --- a/kobjects/org/ksoap2/kobjects/mime/Decoder.java +++ b/kobjects/org/ksoap2/kobjects/mime/Decoder.java
@@ -22,7 +22,7 @@ import java.io.*; import java.util.*; -import org.ksoap2.kobjects.base64.*; +import org.ksoap2.kobjects.base64.Base64; public class Decoder {