tree be4befe08fc14c5173594fcd613080c9ab70ecc3
parent 698b33ea7f78d200df73ef869d68cfc5ab36e604
parent c52503acf0a5e4140376391f57de539fbe60ea8f
author Lorenzo Colitti <lorenzo@google.com> 1446106591 +0000
committer android-build-merger <android-build-merger@google.com> 1446106591 +0000

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

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