| commit | a132f2f1792c807c55da60e1870090bfe2c51934 | [log] [tgz] |
|---|---|---|
| author | Anirudh Dewani <anirudhd@google.com> | Tue Jul 03 12:35:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 03 12:35:19 2012 -0700 |
| tree | 6b38e39cc91ae9b0968d04769d84828092ca2ee9 | |
| parent | d01f6efb6812d398a6f6c188d1725c8f0d256986 [diff] | |
| parent | 8ab50ab5a6413ba245d0d9e907fd1a01ef5a3138 [diff] |
am 8ab50ab5: am 89c08bb5: Merge "WiFi Direct Service Discovery sample" into jb-dev * commit '8ab50ab5a6413ba245d0d9e907fd1a01ef5a3138': WiFi Direct Service Discovery sample