tree b8dc809603df7c6852772c3fac8cc38e25fe895b
parent 8b5d3ff40ed30afa36c4cf47bd7f3d9076e79e29
parent 14dc3d51b63fe1ac19f511ebf3132a56ffa7cc26
author Xin Li <delphij@google.com> 1599784773 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784773 +0000

[automerger skipped] Merge Android R am: 14dc3d51b6 -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: I75d69a6db39b7be22a4ad6e544a46b6d12cb51b0