OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4d37f5 0b57289)
am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function"
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 23 Jun 2014 22:02:12 +0000 (22:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 23 Jun 2014 22:02:12 +0000 (22:02 +0000)
* commit '0b57289678a4dc82fefa4894901af1be7f5cc3c6':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function


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