Commit 443b8b12 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Use the more standard "timeout" if available." am: 80c55bb0 am: 0a41bd82 

am: 8e63aac8

Change-Id: I8a6eb5c8d3db3a4bd79ed55bf13b1536d29b6917
parents 24d1cf34 8e63aac8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment