| commit | 6f2b31fcf57e4e7f5cd8af9b66619c8f5825a850 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Thu Jul 11 17:09:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 17:09:14 2013 -0700 |
| tree | e6aebecb05d864446be9f4c1425fed84bb63b8a9 | |
| parent | 330cf2f7ffc619d51bce7901590c33adc4b0c863 [diff] | |
| parent | 56a7e4ad43eb5288a80b34566db365aaaa845e87 [diff] |
am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev * commit '56a7e4ad43eb5288a80b34566db365aaaa845e87': Block Wifi P2p discovery while doing dhcp.