OSDN Git Service

am a5d24d42: Merge "Redesign p2p around provision discovery"
authorIrfan Sheriff <isheriff@google.com>
Wed, 30 Nov 2011 15:49:12 +0000 (07:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Nov 2011 15:49:12 +0000 (07:49 -0800)
* commit 'a5d24d42ff8b99383a8c3051b9459e5248cf8536':
  Redesign p2p around provision discovery


Trivial merge