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

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

Change-Id: Ib733f87eb11acf5ba248b89f74a85c8ce9b9f7ef