OSDN Git Service

Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc...
authorLorenzo Colitti <lorenzo@google.com>
Thu, 29 Oct 2015 18:20:30 +0000 (18:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Oct 2015 18:20:30 +0000 (18:20 +0000)
commit8a484fbb8c74cf617694879e65f4f9f4a986643b
tree46ef2cec7ec99af8a5be4d91904502d59a55dec6
parent52e52f6f562ae160399afef4c7280c08fbb45aa9
parentbce5116b8d10c91436445cd0a0830bb51702bfd4
Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d am: e4aacaeec9 am: c52503acf0
am: bce5116b8d

* commit 'bce5116b8d10c91436445cd0a0830bb51702bfd4':
  Don't crash if a DHCP server doesn't send the server ID option.