OSDN Git Service

am 5d7d6ace: am efb9743f: am 86c93df1: Merge "Increase timeouts for p2p" into jb...
authorIrfan Sheriff <isheriff@google.com>
Wed, 31 Oct 2012 20:20:01 +0000 (13:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 20:20:01 +0000 (13:20 -0700)
commit85bade19e46fd326f1a4bf97424ef0ad697fbc81
tree5862b78d667371e87353d024d877a07edf11fa94
parent72681791764a6364216e2a4f35fbb5ec73900a24
parent5d7d6ace05e310115d13fe31d68a218c7f20c18c
am 5d7d6ace: am efb9743f: am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev

* commit '5d7d6ace05e310115d13fe31d68a218c7f20c18c':
  Increase timeouts for p2p