am a77d0ef4: (-s ours) am 0b572896: (-s ours) Merge "DO NOT MERGE refactor...
am a77d0ef4: (-s ours) am 0b572896: (-s ours) Merge "DO NOT MERGE refactor wifi p2p\'s startDhcpServer function"
* commit 'a77d0ef4':
DO NOT MERGE refactor wifi p2p's startDhcpServer function