Commit 0a41bd82 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

Change-Id: I830cd126cfe490626f5a2897d0f1be9e524d04d3
parents 9a6402da 80c55bb0
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