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