OSDN Git Service

Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 12 Jul 2013 00:04:45 +0000 (00:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Jul 2013 00:04:45 +0000 (00:04 +0000)
commit116d46659889f588fa9ffa5e1bc4dda90067fce6
tree956ca7311d552f1d38d3c44b1056bdcd40af9a0f
parent57b0fed7a9a1a1fe6ed5dce3bb6855f03c1b15a8
parent6433ef29006cc151930dd9efdca82e6a4d2833e9
Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev