tree fe3c8ec755ec8de9ad4e68e66ce64c0e25cfd5c2
parent 1ee4a513cd0f447e969dcec99e9ef2d7ae66fdd7
parent db9c73c99a7a8fbf0645bb888a9e4a3534c30db4
author Xin Li <delphij@google.com> 1633683565 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683565 +0000

[automerger skipped] Merge Android 12 am: 0542c7d495 -s ours am: d0d2dafde4 -s ours am: da15ab581e -s ours am: 47a7052af8 -s ours am: db9c73c99a -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: Id08b69dae6403f14b44adf03eb8599a571f6261c