tree 58d04e39719cd54a036cb25778af7d05a581880f
parent b446883f3f66bf5f760c884c007dbe40de49b06b
parent e40917b1ae0c2af40ebaa6a1b1928edadc35e8ac
author Hugo Benichi <hugobenichi@google.com> 1478822606 +0000
committer android-build-merger <android-build-merger@google.com> 1478822606 +0000

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206
am: e40917b1ae

Change-Id: I69225098ff2d75aa1a3f5245c0703c06282c7441