Commit 3d8a9512 authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android Git Automerger
Browse files

am 38c4a564: Merge "Increase timeout for testSetMaxFileSize test" into jb-mr1-dev 

* commit '38c4a564':
  Increase timeout for testSetMaxFileSize test
parents b1f41228 38c4a564
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