| commit | 38e8763df55ebedcf65178f8acced806113af4a5 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Dec 17 20:58:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 20:58:44 2014 +0000 |
| tree | 9546d6b4e088ba7e7b19afc0b004cd30237dec42 | |
| parent | 2045d5f3a23f8e462d05acf6d6cf6ea08e236a1e [diff] | |
| parent | 0b3718d6b157bf15db9d709d50019f81f06195b9 [diff] |
am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183 * commit '0b3718d6b157bf15db9d709d50019f81f06195b9': Add global setting for ephemeral network timeout.