| commit | cc4f18309a2a576b282a399a97a9d64d66713b89 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Wed Dec 17 20:51:09 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Dec 17 20:51:12 2014 +0000 |
| tree | b139185de3068c831d3176754a1128f14e34bfe6 | |
| parent | e8ea164596b3ab2309d7b99fa52aecd056e50e24 [diff] | |
| parent | a20ca67d944a8a015206dcdec41eb87f55165358 [diff] |
Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev