Commit 47d12d25 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Blacklist two tests due to timeout." am: 7591bdad am: 32aec33f 

am: 9a50f5c5

Change-Id: Ieae0392400ed401224b3993bd1762120d342c53a
parents 6c58d814 9a50f5c5
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