| commit | 7f043de9a9eb0b071b93ddfffdc5ba0f6d1c7309 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Sep 04 09:23:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 04 09:23:13 2013 -0700 |
| tree | 9056ee7e146011a8e8c6329f41135a747329e4d2 | |
| parent | 703b34bb13e009b8d82f96f17626f806007bd042 [diff] | |
| parent | c6ed9ff77a6ce1ed05397a4abdea8ebb8a290b42 [diff] |
am c6ed9ff7: am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs * commit 'c6ed9ff77a6ce1ed05397a4abdea8ebb8a290b42': replace instances of Wi-Fi Direct with Wi-Fi P2P