OSDN Git Service

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

* commit 'efb9743f24044390273be6722656c2bf3ffddc7d':
  Increase timeouts for p2p