Commit 05614e51 authored by Alex Light's avatar Alex Light Committed by android-build-merger
Browse files

Merge "Increase test 961 dex2oat timeout to 2 minutes" am: 35054649 am: 3c0f1f44 am: 2fb6246b 

am: d01f42be

Change-Id: I5bf52fa65cf12394a9b5211c36dd1959d2fc0e06
parents 6dbbedd3 d01f42be
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