OSDN Git Service

am 2b380488: P2P: Skip join in case of provision discovery failure
authorDmitry Shmidt <dimitrysh@google.com>
Thu, 13 Sep 2012 18:14:22 +0000 (11:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Sep 2012 18:14:22 +0000 (11:14 -0700)
* commit '2b380488c6b5d21e54e98397c7a8d6a9f16dd8b5':
  P2P: Skip join in case of provision discovery failure


Trivial merge