tree 942c0fbdb094116ce3ac43214668e56076bcd677
parent fc30c493559964666967777fa7013acc4b3678b2
parent c17d4ee9bca4d4fc8c89f90a9aa8d3f22333c542
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586377155 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1586377155 +0000

Merge "Merge "Set pending client to null after timeout resumes" into rvc-dev am: a0222398c5 am: d13a097137" into rvc-d1-dev-plus-aosp