OSDN Git Service

am a7534b9c: Fix join for p2p_connect
authorIrfan Sheriff <isheriff@google.com>
Fri, 7 Sep 2012 01:35:57 +0000 (18:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Sep 2012 01:35:57 +0000 (18:35 -0700)
* commit 'a7534b9cdb4f9c2b9ca56761119b0505626f03d6':
  Fix join for p2p_connect


Trivial merge