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