| commit | c3adcf9dc745932bf3a059a7201644dd96b97750 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Sep 04 16:14:59 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 04 16:15:00 2013 +0000 |
| tree | 76a19abf8a77b54efd9941728636bc4931cc7b20 | |
| parent | 605d56c0492536488c997c6ca0b85fd38fd4e19a [diff] | |
| parent | f5e0970c471d8bb3775febe4d1fb422a337c462c [diff] |
Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs