Skip to content
Commit 33fa5dfa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Making timeouts configurable through Settings" into nyc-mr1-dev

parents 6ac6ceb2 dbbc7af0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment