tree ccea6f5053065778e64625fba99e6c03f374812f
parent 1b7d0d0b6570fe4934000280618db8a92e75bef0
parent 2d58be716dbb2702c6f6be8007e8baa5e08115fb
author frankfeng <frankfeng@google.com> 1649824174 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649824174 +0000

Merge remote-tracking branch 'aosp/upstream-master' into pyserial am: 348b762da3 am: cca8c1983c am: ae372032e5 am: 742eee7094 am: 2d58be716d

Original change: https://android-review.googlesource.com/c/platform/external/python/pyserial/+/2062572

Change-Id: Ice6555930adaa52e39d3ccabf456f339b1906514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>