tree f3eb1a6d7df430150256b7e3ebfbedcce1306f9d
parent 7d284943e7d9668033b2b334274e75cc3b667e46
parent f0b86a84ce7bfc2f40265239f5275dd708efc300
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583366023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583366023 +0000

Merge "Convert a couple more cases of failures" am: f0b86a84ce

Change-Id: Ia6fd3187d0c0f0df97b5c249dc00d68a41df2643