OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f579f13 ca0d88b)
am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P...
authorScott Main <smain@google.com>
Wed, 4 Sep 2013 16:20:31 +0000 (09:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Sep 2013 16:20:31 +0000 (09:20 -0700)
* commit 'ca0d88b841db52fc926027f412003a8bf6efdf39':
  replace instances of Wi-Fi Direct with Wi-Fi P2P


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