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