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