| commit | acf4f940322f870474c83983a1b1a7a86fa5a19c | [log] [tgz] |
|---|---|---|
| author | James Kelly <jfkelly@google.com> | Wed Sep 18 18:12:48 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 18 18:12:48 2013 -0700 |
| tree | dd563d3719b2a6aeaae89049c9c283138cedbc9a | |
| parent | cd87d0ab9623d5028d767e8167923c57aa2bac0d [diff] | |
| parent | 03f66d59286809a28e20f1f487ab6c135dd4d298 [diff] |
am 03f66d59: am 1f8cf09c: am 2815bb05: am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs * commit '03f66d59286809a28e20f1f487ab6c135dd4d298': more string changes for wi-fi trademark compliance