Commit 0f7af05f authored by Shubham Ajmera's avatar Shubham Ajmera Committed by android-build-merger
Browse files

Merge "Testrunner: Add timeout support" am: 10f94675 

am: 6c7f458f

Change-Id: Ic7dbca2215a5ea5d804dd6471ff4ff8834ea8815
parents a4c1e7d7 6c7f458f
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