| commit | 86c93df1d626c42147db2f2a6dfb5dcad83477ec | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Oct 31 13:14:21 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 31 13:14:21 2012 -0700 |
| tree | 5862b78d667371e87353d024d877a07edf11fa94 | |
| parent | b8fdecbfd0a0cdbbb17b902a6be87c84227b9b11 [diff] | |
| parent | 1a2ce111ade9563d99ed7bb8156d6148ffd6c3a3 [diff] |
Merge "Increase timeouts for p2p" into jb-mr1-dev