tree ad09832d525fb2b7819b058c2307e4f1807162d1
parent 77f915387a67fe3afdde39a8be38eddcd14b018b
parent a3a4abacaaa97fea084f0007b8e31a67bae97841
author Colin Cross <ccross@android.com> 1635800942 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635800942 +0000

Merge tag '1.5.2' am: c2d6435380 am: 19cd0c9931 am: a3a4abacaa

Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/1877426

Change-Id: I39e0c69c162ac1d30897b15fe0e8738b424d0d07