tree bfd5c8cd393ddc1ad91663c0bc47f7a1a0eaf439
parent 768f9c8b22d9625af61f3e6a7b9a1234b7784f1a
parent f44b9c4a18d17fbd39901f76a014c32006570fb8
author Irfan Sheriff <isheriff@google.com> 1339618979 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339618979 -0700

Merge "Fix p2p service discovery" into jb-dev