tree e769742eb931143f8f2c24d94e6164c8d43914b7
parent ffe302e4231ab8882d9a8ea68c86ed2a04a28fd8
parent f182c233af8a3e6cbda5a63d6681865b46bd1843
author frankfeng <frankfeng@google.com> 1651086616 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651086616 +0000

Merge remote-tracking branch 'aosp/upstream-master' into timeout-decorator am: a77f26f116 am: 6a38905745 am: bb0a49a149 am: f182c233af

Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2072124

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