tree 9b47e0f542bdfaebf621a23089559a93f78cff89
parent f13853ff0fa5eb65afc847176e55ca6db293eb3c
parent 3f3695df2e974811a5759d43f3532dcd9d6be26c
author Tobias Thierer <tobiast@google.com> 1473341819 +0000
committer android-build-merger <android-build-merger@google.com> 1473341819 +0000

Disambiguate Base64 import in ksoap2. am: a3e5f27c89 am: 949b793ca5 am: e59fe5a2e1
am: 3f3695df2e

Change-Id: I3b3bcfb4a88036f461cb1ca3de34008335fdea55