OSDN Git Service

am 1f8cf09c: am 2815bb05: am 48c6b573: Merge "more string changes for wi-fi trademark...
authorJames Kelly <jfkelly@google.com>
Thu, 19 Sep 2013 01:10:14 +0000 (18:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Sep 2013 01:10:14 +0000 (18:10 -0700)
commit03f66d59286809a28e20f1f487ab6c135dd4d298
tree6bae00fb99d4ec85b56be4d810ff585888d3d835
parentf429247867ac524cf63bc01499ac47a90ebcaca9
parent1f8cf09c53c72d26ca67974d1b7e51112be4a170
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