tree 48a9119512efca8912ba8620862cc20fac08f328
parent 6ac6ceb28bf8871db213cbccfb966c8e6040738e
parent dbbc7af06363435492410227c3c2b703ebda80e4
author TreeHugger Robot <treehugger-gerrit@google.com> 1467988593 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467988594 +0000

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