| commit | 1eb5ca609a02eaa6ddd86273e60f58782c10f42b | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Dec 17 21:05:53 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 17 21:05:53 2014 +0000 |
| tree | c83d0336ccd16c41af3d807fbae03f63722f2e54 | |
| parent | f46a0b6f2060c92eb7538b5e00e53fd228bff40b [diff] | |
| parent | 38e8763df55ebedcf65178f8acced806113af4a5 [diff] |
am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183 automerge: 38e8763 * commit '38e8763df55ebedcf65178f8acced806113af4a5': Add global setting for ephemeral network timeout.