Commit 819fe5be authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android Git Automerger
Browse files

am 9d33c060: am 3d8a9512: am 38c4a564: Merge "Increase timeout for... 

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

* commit '9d33c060':
  Increase timeout for testSetMaxFileSize test
parents 63b3f123 9d33c060
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