Commit 8e63aac8 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

Change-Id: I1b544adcd5f312bef92e9e362492fe9ad7875993
parents ca4ae9e2 0a41bd82
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