| commit | 33fa5dfa1d0bcd27ac3a2db8ce72f430c5a3204b | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jul 08 14:36:33 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 08 14:36:34 2016 +0000 |
| tree | 48a9119512efca8912ba8620862cc20fac08f328 | |
| parent | 6ac6ceb28bf8871db213cbccfb966c8e6040738e [diff] | |
| parent | dbbc7af06363435492410227c3c2b703ebda80e4 [diff] |
Merge "Making timeouts configurable through Settings" into nyc-mr1-dev