commit f2104b11a8b9111a07d80ee8de66a42f57e4d102
author Lorenzo Colitti <lorenzo@google.com> Fri Mar 20 08:29:25 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 20 08:29:26 2015 +0000
tree 204ec28c2ef37ceb57f5329484388a0944803df4
parent e37628c0319c3e9dc8305a547222fee476d70472
parent 06ac4b8dd1877d8a82103f11c236f1527b692f94

Merge changes Iddc971c7,If907f49f,I5505bd2c,I110b5800,I9aeb29c2, ...

* changes:
  DHCP: Don't write options longer than 255 bytes.
  DHCP: parsing robustness fixes.
  DHCP: Add a hidden setting to use the legacy DHCP client.
  DHCP: Add a Java DHCP client.
  Add a protectFromVpn method that takes a FileDescriptor
  DHCP: protocol changes.
  DHCP: glue code.
  DHCP: Ethernet/IP packet header changes.
  DHCP: Minor cleanups to the packet code.
  DHCP: Move the packet code to frameworks/base/services.
  DHCP: Add a native method for making a DHCP socket.
  DHCP: Add a superclass for DhcpStateMachine.
  Add two utility methods for IPv4 netmasks.