OSDN Git Service

Merge "Increase timeouts for p2p" into jb-mr1-dev
authorIrfan Sheriff <isheriff@google.com>
Wed, 31 Oct 2012 20:14:21 +0000 (13:14 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 31 Oct 2012 20:14:21 +0000 (13:14 -0700)
commit86c93df1d626c42147db2f2a6dfb5dcad83477ec
tree5862b78d667371e87353d024d877a07edf11fa94
parentb8fdecbfd0a0cdbbb17b902a6be87c84227b9b11
parent1a2ce111ade9563d99ed7bb8156d6148ffd6c3a3
Merge "Increase timeouts for p2p" into jb-mr1-dev