| commit | 56a7e4ad43eb5288a80b34566db365aaaa845e87 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Thu Jul 11 17:07:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 17:07:06 2013 -0700 |
| tree | 956ca7311d552f1d38d3c44b1056bdcd40af9a0f | |
| parent | 7afc5ca353c9b4a3839c988fe6c281289495a18a [diff] | |
| parent | 116d46659889f588fa9ffa5e1bc4dda90067fce6 [diff] |
am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev * commit '116d46659889f588fa9ffa5e1bc4dda90067fce6': Block Wifi P2p discovery while doing dhcp.