Skip to content
Commit 540cc694 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Use `timeout -i` to distinguish cases where logcat is making progress."... 

Merge "Use `timeout -i` to distinguish cases where logcat is making progress." am: 6c621084 am: b67d6e52

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2178436



Change-Id: I449427a51fd72714abdfcc2ee6eb09def030eb0d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58eddcea b67d6e52
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment