tree 28f4b594992c67f3ecc26dff01540b94db8beaa3
parent ffe302e4231ab8882d9a8ea68c86ed2a04a28fd8
parent 7805d425eeaa9ee41f8b188eaffddea7e1fc50ad
author Frank Feng <frankfeng@google.com> 1654810422 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654810422 +0000

Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: e2a8f4c150 am: 7805d425ee

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

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