Commit 9368dadc authored by Christopher Ferris's avatar Christopher Ferris Committed by Android Git Automerger
Browse files

am 16c62c46: am 50ad67e4: Merge "Add better timeout mechanism for running commands." 

* commit '16c62c46':
  Add better timeout mechanism for running commands.
parents a27e2f71 16c62c46
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