Commits
James Kelly authored and Android Git Automerger committed 1f8cf09c53cM
am 2815bb05: am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs * commit '2815bb05a042975b282f7131514368aa89cf0dd4': more string changes for wi-fi trademark compliance
Showing diff to2815bb05a04