tree 1d73ade25c9455b807cef76918711a87e312dfd1
parent 2eb9e3727e2e8176607356f8972a6b7bf61d02aa
parent 672fa25cea55f0de063fe45e29425e6da7bbcbe6
author Anirudh Dewani <anirudhd@google.com> 1341343781 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1341343781 -0700

Merge "WiFi Direct Service Discovery sample" into jb-dev