Commit d01f42be 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

Change-Id: If1254d1fc14af1a0dc11b08cfd0a2bc84d5a450f
parents f4a116fd 2fb6246b
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