| commit | c6ed9ff77a6ce1ed05397a4abdea8ebb8a290b42 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Sep 04 09:20:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 04 09:20:31 2013 -0700 |
| tree | a5c1a7593e9cdc8e9c2dc995a7c4ea54eec661f0 | |
| parent | f579f134ee9495571899be958983a1a242457603 [diff] | |
| parent | ca0d88b841db52fc926027f412003a8bf6efdf39 [diff] |
am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs * commit 'ca0d88b841db52fc926027f412003a8bf6efdf39': replace instances of Wi-Fi Direct with Wi-Fi P2P