OSDN Git Service

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)
commita77d0ef49e8c4b53e1cd794c0739584914bd6eda
tree6db827d51a0bf0a91984d9f1b9b8519f64a4a0cc
parentc4d37f58a1b5405812eaf96b4bd3a051d86884eb
parent0b57289678a4dc82fefa4894901af1be7f5cc3c6
am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function"

* commit '0b57289678a4dc82fefa4894901af1be7f5cc3c6':
  DO NOT MERGE refactor wifi p2p's startDhcpServer function