tree b139185de3068c831d3176754a1128f14e34bfe6
parent e8ea164596b3ab2309d7b99fa52aecd056e50e24
parent a20ca67d944a8a015206dcdec41eb87f55165358
author Jeff Davidson <jpd@google.com> 1418849469 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1418849472 +0000

Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev