OSDN Git Service

am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev
authorIrfan Sheriff <isheriff@google.com>
Wed, 31 Oct 2012 20:15:58 +0000 (13:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 20:15:58 +0000 (13:15 -0700)
commitefb9743f24044390273be6722656c2bf3ffddc7d
tree5862b78d667371e87353d024d877a07edf11fa94
parenta27072d9cc9ca8ee39cc4d8d645f6b0721ba5c8e
parent86c93df1d626c42147db2f2a6dfb5dcad83477ec
am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev

* commit '86c93df1d626c42147db2f2a6dfb5dcad83477ec':
  Increase timeouts for p2p