tree fe3c8ec755ec8de9ad4e68e66ce64c0e25cfd5c2
parent 08145b3f7aeedc9a89c66a8dba8f0afa5647304a
parent da15ab581eec05520fa21a513f023b3c11d08aa5
author Xin Li <delphij@google.com> 1633679776 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679776 +0000

[automerger skipped] Merge Android 12 am: 0542c7d495 -s ours am: d0d2dafde4 -s ours am: da15ab581e -s ours

am skip reason: Merged-In Icf16224e798492e78d32717df442b033d005ddaa with SHA-1 814fca5bba is already in history

Original change: https://android-review.googlesource.com/c/platform/external/ksoap2/+/1847426

Change-Id: I632cc8b2152bebdb9c0dc529d1f6817d9ab06ac6