tree b8dc809603df7c6852772c3fac8cc38e25fe895b
parent c369e9aef634623899468129fc5c4ce9c3ff75a6
parent efb2f998bbf0d5993245f81d62f06e8c18e61722
author Xin Li <delphij@google.com> 1599796719 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796719 +0000

[automerger skipped] Merge Android R am: 14dc3d51b6 -s ours am: cb5b29ea9a -s ours am: 84fa9ffdc6 -s ours am: efb2f998bb -s ours

am skip reason: Change-Id I03454d7328b0c1fe58206f6dbb8dab3a6d5337f1 with SHA-1 8b5d3ff40e is in history

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

Change-Id: Idab60d0c787cac608817591e736adf0b39d98ce6