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)

Trivial merge