OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f429247 1f8cf09)
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)
* commit '1f8cf09c53c72d26ca67974d1b7e51112be4a170':
  more string changes for wi-fi trademark compliance


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help