| commit | efb9743f24044390273be6722656c2bf3ffddc7d | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Oct 31 13:15:58 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 13:15:58 2012 -0700 |
| tree | 5862b78d667371e87353d024d877a07edf11fa94 | |
| parent | a27072d9cc9ca8ee39cc4d8d645f6b0721ba5c8e [diff] | |
| parent | 86c93df1d626c42147db2f2a6dfb5dcad83477ec [diff] |
am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev * commit '86c93df1d626c42147db2f2a6dfb5dcad83477ec': Increase timeouts for p2p