tree 9b47e0f542bdfaebf621a23089559a93f78cff89
parent f13853ff0fa5eb65afc847176e55ca6db293eb3c
parent 949b793ca5470640a1f2f2b09ba2988acd7df8e3
author Tobias Thierer <tobiast@google.com> 1473341069 +0000
committer android-build-merger <android-build-merger@google.com> 1473341069 +0000

Disambiguate Base64 import in ksoap2. am: a3e5f27c89
am: 949b793ca5

Change-Id: I100447672185c39c6eda3cafe3924154abbb0331