tree 4cb1ce6184c57a41a1858056d74def719a92e799
parent 21d6bc8c6acd01cd2c4b2abdaf1b0ff58e25aacd
parent f8cf333364de621745989b6c8197ed79b013bd48
author Irfan Sheriff <isheriff@google.com> 1334249360 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334249360 -0700

Merge "Revert "Fix service discovery add""