| commit | 2815bb05a042975b282f7131514368aa89cf0dd4 | [log] [tgz] |
|---|---|---|
| author | James Kelly <jfkelly@google.com> | Wed Sep 18 18:04:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 18 18:04:45 2013 -0700 |
| tree | 07a87d618d605a8a90163635c8c393159d99c537 | |
| parent | fe790af5897a9c466b5b0a79201ad7752782eaac [diff] | |
| parent | 48c6b5735ef6a8f6afe92ed7c34d848d1f7754a3 [diff] |
am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs * commit '48c6b5735ef6a8f6afe92ed7c34d848d1f7754a3': more string changes for wi-fi trademark compliance