| commit | 8a6b090fd49789a63775f52dc4966a82bae76747 | [log] [tgz] |
|---|---|---|
| author | Suprabh Shukla <suprabh@google.com> | Fri Jul 08 14:52:26 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 08 14:52:26 2016 +0000 |
| tree | c8e289cc99ca890f20e3feacc74dca3a644daf54 | |
| parent | f0f1d016e334bf5f459ec4121c6d407bad689932 [diff] | |
| parent | 087d33febffdd28d85021800aa42a51b94b64f4a [diff] |
Merge \\"Making timeouts configurable through Settings\\" into nyc-mr1-dev am: 33fa5dfa1d am: 087d33febf Change-Id: If1bb99b356d4b6fdf3471e1ccccc2c6ebf8ace43