Commit 38c4a564 authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android (Google) Code Review
Browse files

Merge "Increase timeout for testSetMaxFileSize test" into jb-mr1-dev

parents 39c16ef7 1375b667
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